| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 | 10 |
| (...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1126 #endif | 1126 #endif |
| 1127 | 1127 |
| 1128 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) | 1128 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) |
| 1129 // These flags show the man page on Linux. They are equivalent to each | 1129 // These flags show the man page on Linux. They are equivalent to each |
| 1130 // other. | 1130 // other. |
| 1131 const char kHelp[] = "help"; | 1131 const char kHelp[] = "help"; |
| 1132 const char kHelpShort[] = "h"; | 1132 const char kHelpShort[] = "h"; |
| 1133 | 1133 |
| 1134 // Specifies which password store to use (detect, default, gnome, kwallet). | 1134 // Specifies which password store to use (detect, default, gnome, kwallet). |
| 1135 const char kPasswordStore[] = "password-store"; | 1135 const char kPasswordStore[] = "password-store"; |
| 1136 |
| 1137 // Updates X11Desktophandler::wm_user_time_ms with the latest X server time. |
| 1138 const char kWmUserTimeMs[] = "wm-user-time-ms"; |
| 1136 #endif | 1139 #endif |
| 1137 | 1140 |
| 1138 #if defined(OS_MACOSX) | 1141 #if defined(OS_MACOSX) |
| 1139 // Prevents Chrome from quitting when Chrome Apps are open. | 1142 // Prevents Chrome from quitting when Chrome Apps are open. |
| 1140 const char kAppsKeepChromeAliveInTests[] = "apps-keep-chrome-alive-in-tests"; | 1143 const char kAppsKeepChromeAliveInTests[] = "apps-keep-chrome-alive-in-tests"; |
| 1141 | 1144 |
| 1142 // Shows a notification when quitting Chrome with hosted apps running. Default | 1145 // Shows a notification when quitting Chrome with hosted apps running. Default |
| 1143 // behavior is to also quit all hosted apps. | 1146 // behavior is to also quit all hosted apps. |
| 1144 const char kHostedAppQuitNotification[] = "enable-hosted-app-quit-notification"; | 1147 const char kHostedAppQuitNotification[] = "enable-hosted-app-quit-notification"; |
| 1145 | 1148 |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1363 | 1366 |
| 1364 // ----------------------------------------------------------------------------- | 1367 // ----------------------------------------------------------------------------- |
| 1365 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. | 1368 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. |
| 1366 // | 1369 // |
| 1367 // You were going to just dump your switches here, weren't you? Instead, please | 1370 // You were going to just dump your switches here, weren't you? Instead, please |
| 1368 // put them in alphabetical order above, or in order inside the appropriate | 1371 // put them in alphabetical order above, or in order inside the appropriate |
| 1369 // ifdef at the bottom. The order should match the header. | 1372 // ifdef at the bottom. The order should match the header. |
| 1370 // ----------------------------------------------------------------------------- | 1373 // ----------------------------------------------------------------------------- |
| 1371 | 1374 |
| 1372 } // namespace switches | 1375 } // namespace switches |
| OLD | NEW |