Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: chrome/common/chrome_switches.cc

Issue 7215040: Fix relaunches on the Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/chrome_switches.h" 5 #include "chrome/common/chrome_switches.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 9
10 namespace switches { 10 namespace switches {
11 11
12 // ----------------------------------------------------------------------------- 12 // -----------------------------------------------------------------------------
13 // Can't find the switch you are looking for? try looking in 13 // Can't find the switch you are looking for? try looking in
14 // base/base_switches.cc instead. 14 // base/base_switches.cc instead.
15 // ----------------------------------------------------------------------------- 15 // -----------------------------------------------------------------------------
16 16
17 // Activate (make foreground) myself on launch. Helpful when Chrome
18 // is launched on the command line (e.g. by Selenium). Only needed on Mac.
19 const char kActivateOnLaunch[] = "activate-on-launch";
20
21 // Allow third party content included on a page to prompt for a HTTP 17 // Allow third party content included on a page to prompt for a HTTP
22 // basic auth username/password pair. 18 // basic auth username/password pair.
23 const char kAllowCrossOriginAuthPrompt[] = "allow-cross-origin-auth-prompt"; 19 const char kAllowCrossOriginAuthPrompt[] = "allow-cross-origin-auth-prompt";
24 20
25 // On ChromeOS, file:// access is disabled except for certain whitelisted 21 // On ChromeOS, file:// access is disabled except for certain whitelisted
26 // directories. This switch re-enables file:// for testing. 22 // directories. This switch re-enables file:// for testing.
27 const char kAllowFileAccess[] = "allow-file-access"; 23 const char kAllowFileAccess[] = "allow-file-access";
28 24
29 // Allow non-https URL for background_page for hosted apps. 25 // Allow non-https URL for background_page for hosted apps.
30 const char kAllowHTTPBackgroundPage[] = "allow-http-background-page"; 26 const char kAllowHTTPBackgroundPage[] = "allow-http-background-page";
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 1100
1105 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 1101 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
1106 // Specifies which password store to use (detect, default, gnome, kwallet). 1102 // Specifies which password store to use (detect, default, gnome, kwallet).
1107 const char kPasswordStore[] = "password-store"; 1103 const char kPasswordStore[] = "password-store";
1108 #endif 1104 #endif
1109 #endif 1105 #endif
1110 1106
1111 #if defined(OS_MACOSX) 1107 #if defined(OS_MACOSX)
1112 // Enables the tabs expose feature ( http://crbug.com/50307 ). 1108 // Enables the tabs expose feature ( http://crbug.com/50307 ).
1113 const char kEnableExposeForTabs[] = "enable-expose-for-tabs"; 1109 const char kEnableExposeForTabs[] = "enable-expose-for-tabs";
1110
1111 // A process type (switches::kProcessType) that relaunches the browser. See
1112 // chrome/browser/mac/relauncher.h.
1113 const char kRelauncherProcess[] = "relauncher";
1114 #endif 1114 #endif
1115 1115
1116 #if !defined(OS_MACOSX) 1116 #if !defined(OS_MACOSX)
1117 // Enable Kiosk mode. 1117 // Enable Kiosk mode.
1118 const char kKioskMode[] = "kiosk"; 1118 const char kKioskMode[] = "kiosk";
1119 #endif 1119 #endif
1120 1120
1121 #if defined(TOOLKIT_VIEWS) 1121 #if defined(TOOLKIT_VIEWS)
1122 // Enables debug paint in views framework. Enabling this causes the damaged 1122 // Enables debug paint in views framework. Enabling this causes the damaged
1123 // region being painted to flash in red. 1123 // region being painted to flash in red.
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 1186
1187 // ----------------------------------------------------------------------------- 1187 // -----------------------------------------------------------------------------
1188 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1188 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1189 // 1189 //
1190 // You were going to just dump your switches here, weren't you? Instead, 1190 // You were going to just dump your switches here, weren't you? Instead,
1191 // please put them in alphabetical order above, or in order inside the 1191 // please put them in alphabetical order above, or in order inside the
1192 // appropriate ifdef at the bottom. The order should match the header. 1192 // appropriate ifdef at the bottom. The order should match the header.
1193 // ----------------------------------------------------------------------------- 1193 // -----------------------------------------------------------------------------
1194 1194
1195 } // namespace switches 1195 } // namespace switches
OLDNEW
« chrome/common/chrome_switches.h ('K') | « chrome/common/chrome_switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698