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/notifications | |
| 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/notifications')
| -rw-r--r-- | chrome/browser/notifications/notification_options_menu_model.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc index 4190dcd..45620c9 100644 --- a/chrome/browser/notifications/notification_options_menu_model.cc +++ b/chrome/browser/notifications/notification_options_menu_model.cc @@ -13,6 +13,7 @@ #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notifications_prefs_cache.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" @@ -20,7 +21,6 @@ #if defined(OS_WIN) #include "chrome/browser/ui/views/browser_dialogs.h" -#include "chrome/installer/util/install_util.h" #endif // OS_WIN // Menu commands @@ -150,7 +150,8 @@ void NotificationOptionsMenuModel::ExecuteCommand(int command_id) { CONTENT_SETTINGS_TYPE_NOTIFICATIONS); } else { #if defined(OS_WIN) - if (InstallUtil::IsChromeFrameProcess()) { + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kChromeFrame)) { // We may not have a browser if this is a chrome frame process. browser::ShowContentSettingsWindow(NULL, CONTENT_SETTINGS_TYPE_DEFAULT, |