chrome/browser/prefs/command_line_pref_store.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 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

« no previous file with comments | « chrome/browser/prefs/command_line_pref_store.h ('k') | chrome/browser/prefs/command_line_pref_store_unittest.cc » ('j') | chrome/chrome_browser.gypi » ('J')

OLD	NEW
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/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/values.h"	8 #include "base/values.h"

9 #include "chrome/common/chrome_switches.h"	9 #include "chrome/common/chrome_switches.h"

10 #include "chrome/common/pref_names.h"	10 #include "chrome/common/pref_names.h"

11	11

12 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry	12 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry

13 CommandLinePrefStore::string_switch_map_[] = {	13 CommandLinePrefStore::string_switch_map_[] = {

14 { switches::kLang, prefs::kApplicationLocale },	14 { switches::kLang, prefs::kApplicationLocale },

15 { switches::kProxyServer, prefs::kProxyServer },	15 { switches::kProxyServer, prefs::kProxyServer },

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 (command_line_->HasSwitch(switches::kProxyAutoDetect) \|\|	57 (command_line_->HasSwitch(switches::kProxyAutoDetect) \|\|

58 command_line_->HasSwitch(switches::kProxyServer) \|\|	58 command_line_->HasSwitch(switches::kProxyServer) \|\|

59 command_line_->HasSwitch(switches::kProxyPacUrl) \|\|	59 command_line_->HasSwitch(switches::kProxyPacUrl) \|\|

60 command_line_->HasSwitch(switches::kProxyBypassList))) {	60 command_line_->HasSwitch(switches::kProxyBypassList))) {

61 LOG(WARNING) << "Additional command-line proxy switches specified when --"	61 LOG(WARNING) << "Additional command-line proxy switches specified when --"

62 << switches::kNoProxyServer << " was also specified.";	62 << switches::kNoProxyServer << " was also specified.";

63 return false;	63 return false;

64 }	64 }

65 return true;	65 return true;

66 }	66 }

OLD	NEW