diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 21:09:07 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 21:09:07 +0000 |
| commit | a9e8bbe6488ff290b0d32a01c8aeb23900edfca1 (patch) | |
| tree | 66c5c9b597771d92d05ea93c17c9c3f4b6081ad4 /chrome | |
| parent | 48eb3ceb38aa3b945b1706453c42b2f8f6da2639 (diff) | |
| download | chromium_src-a9e8bbe6488ff290b0d32a01c8aeb23900edfca1.zip chromium_src-a9e8bbe6488ff290b0d32a01c8aeb23900edfca1.tar.gz chromium_src-a9e8bbe6488ff290b0d32a01c8aeb23900edfca1.tar.bz2 | |
Fix official build.
I changed the type of this function, but the trybots didn't catch
it because it's in an offical-only ifdef.
Review URL: http://codereview.chromium.org/3236006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/labs.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/labs.cc b/chrome/browser/labs.cc index c4328a1..5a814ce 100644 --- a/chrome/browser/labs.cc +++ b/chrome/browser/labs.cc @@ -148,7 +148,7 @@ bool IsEnabled() { return false; #elif defined(GOOGLE_CHROME_BUILD) // Don't enable this on the stable channel. - return platform_util::GetVersionStringModifier() != string16(); + return !platform_util::GetVersionStringModifier().empty(); #else return true; #endif diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 6b3e68b..e263131 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -93,8 +93,8 @@ ProfileSyncService::ProfileSyncService(ProfileSyncFactory* factory, // For linux Chromium builds, this could be anything depending on the // distribution, so always direct those users to dev server urls. // If this is an official build, it will always be one of the above. - string16 channel = platform_util::GetVersionStringModifier(); - if (channel.empty() || channel == ASCIIToUTF16("beta")) { + std::string channel = platform_util::GetVersionStringModifier(); + if (channel.empty() || channel == "beta") { LOG(INFO) << "Detected official build, using official sync server."; sync_service_url_ = GURL(kSyncServerUrl); } else { |