Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply brave version to chrome/VERSION #258

Merged
merged 1 commit into from
Jul 16, 2018
Merged

Apply brave version to chrome/VERSION #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion browser/version_info_values.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

namespace version_info {
std::string GetBraveVersionNumber() {
return std::string(BRAVE_BROWSER_VERSION) + " Chromium: " + PRODUCT_VERSION;
return std::string(BRAVE_BROWSER_VERSION) +
" Chromium: " + CHROMIUM_VERSION_STRING;
}
} // namespace version_info
6 changes: 6 additions & 0 deletions chromium_src/components/version_info/version_info.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,17 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

#define GetChannelString GetChannelString_ChromiumImpl
#define GetProductNameAndVersionForUserAgent GetProductNameAndVersionForUserAgent_Unused
#include "../../../../components/version_info/version_info.cc"
#undef GetChannelString
#undef GetProductNameAndVersionForUserAgent

namespace version_info {

std::string GetProductNameAndVersionForUserAgent() {
return std::string("Chrome/") + CHROMIUM_VERSION_STRING;
}

// We use |nightly| instead of |canary|.
std::string GetChannelString(Channel channel) {
if (channel == Channel::CANARY)
Expand Down
4 changes: 4 additions & 0 deletions chromium_src/components/version_info/version_info_values.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "gen/components/version_info/version_info_values.h"

#define CHROMIUM_VERSION 67,0,3396,103
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is CHROMIUM_VERSION needed?

#define CHROMIUM_VERSION_STRING "67.0.3396.103"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this just be a generated file instead?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly from brave/brave-browser after init?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or even better by using gen dir with brave-core

11 changes: 11 additions & 0 deletions patches/chrome-VERSION.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 3c03c34dbf7ecdf3673cb796c44c769bc14b1dba..43f26ebad722c3ea1e62f4280e00b7531efeb52f 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=67
MINOR=0
-BUILD=3396
-PATCH=103
+BUILD=50
+PATCH=10