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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2254273003: Remove text encoding UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments Created 4 years, 3 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
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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2354 matching lines...) Expand 10 before | Expand all | Expand 10 after
2365 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); 2365 prefs->GetBoolean(prefs::kWebKitForceEnableZoom);
2366 #endif 2366 #endif
2367 2367
2368 #if defined(OS_ANDROID) 2368 #if defined(OS_ANDROID)
2369 web_prefs->password_echo_enabled = 2369 web_prefs->password_echo_enabled =
2370 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); 2370 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled);
2371 #else 2371 #else
2372 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; 2372 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled;
2373 #endif 2373 #endif
2374 2374
2375 web_prefs->uses_universal_detector = 2375 web_prefs->uses_universal_detector = true; // autodection is always on.
msw 2016/08/23 18:06:27 nit: 'detection'
Jinsuk Kim 2016/08/23 22:46:13 Done.
2376 prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector);
2377 web_prefs->text_areas_are_resizable = 2376 web_prefs->text_areas_are_resizable =
2378 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable); 2377 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable);
2379 web_prefs->hyperlink_auditing_enabled = 2378 web_prefs->hyperlink_auditing_enabled =
2380 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing); 2379 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing);
2381 2380
2382 #if defined(ENABLE_EXTENSIONS) 2381 #if defined(ENABLE_EXTENSIONS)
2383 std::string image_animation_policy = 2382 std::string image_animation_policy =
2384 prefs->GetString(prefs::kAnimationPolicy); 2383 prefs->GetString(prefs::kAnimationPolicy);
2385 if (image_animation_policy == kAnimationPolicyOnce) 2384 if (image_animation_policy == kAnimationPolicyOnce)
2386 web_prefs->animation_policy = 2385 web_prefs->animation_policy =
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
3057 if (channel <= kMaxDisableEncryptionChannel) { 3056 if (channel <= kMaxDisableEncryptionChannel) {
3058 static const char* const kWebRtcDevSwitchNames[] = { 3057 static const char* const kWebRtcDevSwitchNames[] = {
3059 switches::kDisableWebRtcEncryption, 3058 switches::kDisableWebRtcEncryption,
3060 }; 3059 };
3061 to_command_line->CopySwitchesFrom(from_command_line, 3060 to_command_line->CopySwitchesFrom(from_command_line,
3062 kWebRtcDevSwitchNames, 3061 kWebRtcDevSwitchNames,
3063 arraysize(kWebRtcDevSwitchNames)); 3062 arraysize(kWebRtcDevSwitchNames));
3064 } 3063 }
3065 } 3064 }
3066 #endif // defined(ENABLE_WEBRTC) 3065 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698