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

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

Issue 2816513002: Revert of Change base::Value::ListStorage to std::vector<base::Value> (Closed)
Patch Set: Created 3 years, 8 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 1772 matching lines...) Expand 10 before | Expand all | Expand 10 after
1783 command_line->AppendSwitch(switches::kDisable3DAPIs); 1783 command_line->AppendSwitch(switches::kDisable3DAPIs);
1784 } 1784 }
1785 1785
1786 const base::ListValue* switches = 1786 const base::ListValue* switches =
1787 prefs->GetList(prefs::kEnableDeprecatedWebPlatformFeatures); 1787 prefs->GetList(prefs::kEnableDeprecatedWebPlatformFeatures);
1788 if (switches) { 1788 if (switches) {
1789 // Enable any deprecated features that have been re-enabled by policy. 1789 // Enable any deprecated features that have been re-enabled by policy.
1790 for (base::ListValue::const_iterator it = switches->begin(); 1790 for (base::ListValue::const_iterator it = switches->begin();
1791 it != switches->end(); ++it) { 1791 it != switches->end(); ++it) {
1792 std::string switch_to_enable; 1792 std::string switch_to_enable;
1793 if (it->GetAsString(&switch_to_enable)) 1793 if ((*it)->GetAsString(&switch_to_enable))
1794 command_line->AppendSwitch(switch_to_enable); 1794 command_line->AppendSwitch(switch_to_enable);
1795 } 1795 }
1796 } 1796 }
1797 1797
1798 // Disable client-side phishing detection in the renderer if it is 1798 // Disable client-side phishing detection in the renderer if it is
1799 // disabled in the Profile preferences or the browser process. 1799 // disabled in the Profile preferences or the browser process.
1800 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || 1800 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
1801 !g_browser_process->safe_browsing_detection_service()) { 1801 !g_browser_process->safe_browsing_detection_service()) {
1802 command_line->AppendSwitch( 1802 command_line->AppendSwitch(
1803 switches::kDisableClientSidePhishingDetection); 1803 switches::kDisableClientSidePhishingDetection);
(...skipping 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after
3619 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3619 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3620 return variations::GetVariationParamValue( 3620 return variations::GetVariationParamValue(
3621 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3621 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3622 } 3622 }
3623 3623
3624 // static 3624 // static
3625 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3625 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3626 const storage::QuotaSettings* settings) { 3626 const storage::QuotaSettings* settings) {
3627 g_default_quota_settings = settings; 3627 g_default_quota_settings = settings;
3628 } 3628 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698