summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_tab.cc
diff options
context:
space:
mode:
authorrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 21:22:45 +0000
committerrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 21:22:45 +0000
commitc70e5582aba1dbe43e5acf00109b2e6b8429f2d2 (patch)
tree3b151d74a3f5aeaf79727cfb94c88f97b2acf3b5 /chrome_frame/chrome_tab.cc
parent3e14cad77812fbf6606d951b60eebd4f566680db (diff)
downloadchromium_src-c70e5582aba1dbe43e5acf00109b2e6b8429f2d2.zip
chromium_src-c70e5582aba1dbe43e5acf00109b2e6b8429f2d2.tar.gz
chromium_src-c70e5582aba1dbe43e5acf00109b2e6b8429f2d2.tar.bz2
Remove remaining references to CEEE.
BUG=107739 TEST=No visible code changes. Removing constants and code related to CEEE. Review URL: http://codereview.chromium.org/8909009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_tab.cc')
-rw-r--r--chrome_frame/chrome_tab.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index b984e73..6e0373b 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -17,6 +17,7 @@
#include "base/logging.h"
#include "base/logging_win.h"
#include "base/path_service.h"
+#include "base/string16.h"
#include "base/string_number_conversions.h"
#include "base/string_piece.h"
#include "base/string_util.h"
@@ -253,14 +254,13 @@ HRESULT RefreshElevationPolicy() {
HRESULT SetupRunOnce() {
HRESULT result = E_FAIL;
- std::wstring channel_name;
+ string16 channel_name;
if (base::win::GetVersion() < base::win::VERSION_VISTA &&
GoogleUpdateSettings::GetChromeChannelAndModifiers(true, &channel_name)) {
std::transform(channel_name.begin(), channel_name.end(),
channel_name.begin(), tolower);
- // Use this only for the dev channel and CEEE channels.
- if (channel_name.find(L"dev") != std::wstring::npos ||
- channel_name.find(L"ceee") != std::wstring::npos) {
+ // Use this only for the dev channel.
+ if (channel_name.find(L"dev") != string16::npos) {
HKEY hive = HKEY_CURRENT_USER;
if (IsSystemProcess()) {
// For system installs, our updates will be running as SYSTEM which