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

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

Issue 11018013: add a new, blank version of content settings so that a new UI may be prototyped (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 2 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
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 9
10 namespace switches { 10 namespace switches {
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 const char kCloudPrintServiceURL[] = "cloud-print-service"; 185 const char kCloudPrintServiceURL[] = "cloud-print-service";
186 186
187 // Comma-separated options to troubleshoot the component updater. Only valid 187 // Comma-separated options to troubleshoot the component updater. Only valid
188 // for the browser process. 188 // for the browser process.
189 const char kComponentUpdaterDebug[] = "component-updater-debug"; 189 const char kComponentUpdaterDebug[] = "component-updater-debug";
190 190
191 // Causes the browser process to inspect loaded and registered DLLs for known 191 // Causes the browser process to inspect loaded and registered DLLs for known
192 // conflicts and warn the user. 192 // conflicts and warn the user.
193 const char kConflictingModulesCheck[] = "conflicting-modules-check"; 193 const char kConflictingModulesCheck[] = "conflicting-modules-check";
194 194
195 // Toggles a new version of the content settings dialog in options.
196 const char kContentSettings2[] = "new-content-settings";
197
195 // The Country we should use. This is normally obtained from the operating 198 // The Country we should use. This is normally obtained from the operating
196 // system during first run and cached in the preferences afterwards. This is a 199 // system during first run and cached in the preferences afterwards. This is a
197 // string value, the 2 letter code from ISO 3166-1. 200 // string value, the 2 letter code from ISO 3166-1.
198 const char kCountry[] = "country"; 201 const char kCountry[] = "country";
199 202
200 // Causes the browser process to crash if browser threads are not responding 203 // Causes the browser process to crash if browser threads are not responding
201 // for the given number of seconds. 204 // for the given number of seconds.
202 const char kCrashOnHangSeconds[] = "crash-on-hang-seconds"; 205 const char kCrashOnHangSeconds[] = "crash-on-hang-seconds";
203 206
204 // Comma-separated list of BrowserThreads that cause browser process to crash 207 // Comma-separated list of BrowserThreads that cause browser process to crash
(...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after
1603 return true; 1606 return true;
1604 #elif defined(OS_WIN) 1607 #elif defined(OS_WIN)
1605 return true; 1608 return true;
1606 #else 1609 #else
1607 return CommandLine::ForCurrentProcess()->HasSwitch( 1610 return CommandLine::ForCurrentProcess()->HasSwitch(
1608 switches::kEnableFramelessConstrainedDialogs); 1611 switches::kEnableFramelessConstrainedDialogs);
1609 #endif 1612 #endif
1610 } 1613 }
1611 1614
1612 } // namespace chrome 1615 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698