diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 16:57:41 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 16:57:41 +0000 |
| commit | e5b826e46e8a435945f94370bd50bc7ee1749607 (patch) | |
| tree | b971065c84b55f0dc3f44838bc6b6b021e51bffc /chrome/browser/browser_main.cc | |
| parent | 48fe9f38c0fa156a18b6f2d283076db20450321f (diff) | |
| download | chromium_src-e5b826e46e8a435945f94370bd50bc7ee1749607.zip chromium_src-e5b826e46e8a435945f94370bd50bc7ee1749607.tar.gz chromium_src-e5b826e46e8a435945f94370bd50bc7ee1749607.tar.bz2 | |
Removing IsChromeFrameProcess.
This further reduces Chrome's dependencies on the installer and fixes a problem where Chrome might pick up the "chrome_frame" variable from the master preferences file and all chrome processes might have assumed they were cf processes.
TEST=See description.
BUG=61609
Review URL: http://codereview.chromium.org/5973006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index cf4ee07..904c6e2 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -86,7 +86,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/result_codes.h" #include "chrome/installer/util/google_update_settings.h" -#include "chrome/installer/util/master_preferences.h" #include "grit/app_locale_settings.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -688,7 +687,7 @@ void InitializeBrokerServices(const MainFunctionParams& parameters, MetricsService* InitializeMetrics(const CommandLine& parsed_command_line, const PrefService* local_state) { #if defined(OS_WIN) - if (InstallUtil::IsChromeFrameProcess()) + if (parsed_command_line.HasSwitch(switches::kChromeFrame)) MetricsLog::set_version_extension("-F"); #elif defined(ARCH_CPU_64_BITS) MetricsLog::set_version_extension("-64"); |