summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_launcher.cc
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 15:12:46 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 15:12:46 +0000
commit8cc6e41efa5af14f403cbb14b15e3af8ea686c93 (patch)
tree7a190720f5c9a3751502ae525b1ad7acad8143be /chrome_frame/chrome_launcher.cc
parent06256e5dee1d1aa8e5feebe3399634408914a66e (diff)
downloadchromium_src-8cc6e41efa5af14f403cbb14b15e3af8ea686c93.zip
chromium_src-8cc6e41efa5af14f403cbb14b15e3af8ea686c93.tar.gz
chromium_src-8cc6e41efa5af14f403cbb14b15e3af8ea686c93.tar.bz2
Don't allow Chrome to go into background mode when launched by GCF.
Doing so is broken in at least a few ways: - in-use updates don't work as desired (must quit IE for 6h) - there's no UX for quitting Chrome Since extensions aren't really supported in GCF anyway, I don't see a problem with disallowing background mode. BUG=97740 TEST=the easy way: fire up IE and visit gcf:about:version, confirm that --disable-background-mode is on the command line. the hard way: install a background extension via the registry mechanism then launch IE and visit gcf:about:version. now check to see if you have an extension process. if so, see that quitting IE makes all chrome.exe processes disappear. Review URL: http://codereview.chromium.org/8070019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_launcher.cc')
-rw-r--r--chrome_frame/chrome_launcher.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome_frame/chrome_launcher.cc b/chrome_frame/chrome_launcher.cc
index c7ca618..d89fd8a 100644
--- a/chrome_frame/chrome_launcher.cc
+++ b/chrome_frame/chrome_launcher.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -21,16 +21,17 @@ const wchar_t* kAllowedSwitches[] = {
L"automation-channel",
L"chrome-frame",
L"chrome-version",
+ L"disable-background-mode",
+ L"disable-popup-blocking",
L"disable-renderer-accessibility",
L"enable-experimental-extension-apis",
L"force-renderer-accessibility",
+ L"full-memory-crash-report",
L"lang",
L"no-default-browser-check",
- L"noerrdialogs",
L"no-first-run",
+ L"noerrdialogs",
L"user-data-dir",
- L"disable-popup-blocking",
- L"full-memory-crash-report",
};
const wchar_t kWhitespaceChars[] = {