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

Side by Side Diff: chrome/browser/prefs/command_line_pref_store.cc

Issue 6027004: Revert 69753 - Added group policy for disabling all client-side 3D APIs in Ch... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser/prefs/command_line_pref_store.h" 5 #include "chrome/browser/prefs/command_line_pref_store.h"
6 6
7 #include "app/app_switches.h" 7 #include "app/app_switches.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 13 matching lines...) Expand all
24 }; 24 };
25 25
26 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry 26 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
27 CommandLinePrefStore::boolean_switch_map_[] = { 27 CommandLinePrefStore::boolean_switch_map_[] = {
28 { switches::kNoProxyServer, prefs::kNoProxyServer, true }, 28 { switches::kNoProxyServer, prefs::kNoProxyServer, true },
29 { switches::kProxyAutoDetect, prefs::kProxyAutoDetect, true }, 29 { switches::kProxyAutoDetect, prefs::kProxyAutoDetect, true },
30 { switches::kDisableAuthNegotiateCnameLookup, 30 { switches::kDisableAuthNegotiateCnameLookup,
31 prefs::kDisableAuthNegotiateCnameLookup, true }, 31 prefs::kDisableAuthNegotiateCnameLookup, true },
32 { switches::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort, 32 { switches::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort,
33 true }, 33 true },
34 { switches::kDisable3DAPIs, prefs::kDisable3DAPIs, true },
35 }; 34 };
36 35
37 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line) 36 CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line)
38 : command_line_(command_line) { 37 : command_line_(command_line) {
39 ApplySimpleSwitches(); 38 ApplySimpleSwitches();
40 ValidateProxySwitches(); 39 ValidateProxySwitches();
41 } 40 }
42 41
43 CommandLinePrefStore::~CommandLinePrefStore() {} 42 CommandLinePrefStore::~CommandLinePrefStore() {}
44 43
(...skipping 21 matching lines...) Expand all
66 (command_line_->HasSwitch(switches::kProxyAutoDetect) || 65 (command_line_->HasSwitch(switches::kProxyAutoDetect) ||
67 command_line_->HasSwitch(switches::kProxyServer) || 66 command_line_->HasSwitch(switches::kProxyServer) ||
68 command_line_->HasSwitch(switches::kProxyPacUrl) || 67 command_line_->HasSwitch(switches::kProxyPacUrl) ||
69 command_line_->HasSwitch(switches::kProxyBypassList))) { 68 command_line_->HasSwitch(switches::kProxyBypassList))) {
70 LOG(WARNING) << "Additional command-line proxy switches specified when --" 69 LOG(WARNING) << "Additional command-line proxy switches specified when --"
71 << switches::kNoProxyServer << " was also specified."; 70 << switches::kNoProxyServer << " was also specified.";
72 return false; 71 return false;
73 } 72 }
74 return true; 73 return true;
75 } 74 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698