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

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

Issue 299273003: Revert 272587 "Remove kEnablePrintPreview now that the pdf plugi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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) 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/browser/prefs/command_line_pref_store.h" 5 #include "chrome/browser/prefs/command_line_pref_store.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false }, 50 { switches::kNoPings, prefs::kEnableHyperlinkAuditing, false },
51 { switches::kNoReferrers, prefs::kEnableReferrers, false }, 51 { switches::kNoReferrers, prefs::kEnableReferrers, false },
52 { switches::kAllowRunningInsecureContent, 52 { switches::kAllowRunningInsecureContent,
53 prefs::kWebKitAllowRunningInsecureContent, true }, 53 prefs::kWebKitAllowRunningInsecureContent, true },
54 { switches::kNoDisplayingInsecureContent, 54 { switches::kNoDisplayingInsecureContent,
55 prefs::kWebKitAllowDisplayingInsecureContent, false }, 55 prefs::kWebKitAllowDisplayingInsecureContent, false },
56 { switches::kAllowCrossOriginAuthPrompt, 56 { switches::kAllowCrossOriginAuthPrompt,
57 prefs::kAllowCrossOriginAuthPrompt, true }, 57 prefs::kAllowCrossOriginAuthPrompt, true },
58 { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting, 58 { switches::kDisableSSLFalseStart, prefs::kDisableSSLRecordSplitting,
59 true }, 59 true },
60 #if defined(GOOGLE_CHROME_BUILD)
60 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true }, 61 { switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true },
62 #else
63 { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false },
64 #endif
61 #if defined(OS_CHROMEOS) 65 #if defined(OS_CHROMEOS)
62 { chromeos::switches::kEnableTouchpadThreeFingerClick, 66 { chromeos::switches::kEnableTouchpadThreeFingerClick,
63 prefs::kEnableTouchpadThreeFingerClick, true }, 67 prefs::kEnableTouchpadThreeFingerClick, true },
64 #endif 68 #endif
65 { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false }, 69 { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false },
66 { switches::kEnableAsyncDns, prefs::kBuiltInDnsClientEnabled, true }, 70 { switches::kEnableAsyncDns, prefs::kBuiltInDnsClientEnabled, true },
67 }; 71 };
68 72
69 const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry 73 const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry
70 CommandLinePrefStore::integer_switch_map_[] = { 74 CommandLinePrefStore::integer_switch_map_[] = {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 } 173 }
170 } 174 }
171 175
172 void CommandLinePrefStore::ApplyBackgroundModeSwitches() { 176 void CommandLinePrefStore::ApplyBackgroundModeSwitches() {
173 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) || 177 if (command_line_->HasSwitch(switches::kDisableBackgroundMode) ||
174 command_line_->HasSwitch(switches::kDisableExtensions)) { 178 command_line_->HasSwitch(switches::kDisableExtensions)) {
175 base::Value* value = base::Value::CreateBooleanValue(false); 179 base::Value* value = base::Value::CreateBooleanValue(false);
176 SetValue(prefs::kBackgroundModeEnabled, value); 180 SetValue(prefs::kBackgroundModeEnabled, value);
177 } 181 }
178 } 182 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698