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

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

Issue 2740143002: Change base::Value::ListStorage to std::vector<base::Value> (Closed)
Patch Set: Comment Updates Created 3 years, 9 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 1736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1747 command_line->AppendSwitch(switches::kDisable3DAPIs); 1747 command_line->AppendSwitch(switches::kDisable3DAPIs);
1748 } 1748 }
1749 1749
1750 const base::ListValue* switches = 1750 const base::ListValue* switches =
1751 prefs->GetList(prefs::kEnableDeprecatedWebPlatformFeatures); 1751 prefs->GetList(prefs::kEnableDeprecatedWebPlatformFeatures);
1752 if (switches) { 1752 if (switches) {
1753 // Enable any deprecated features that have been re-enabled by policy. 1753 // Enable any deprecated features that have been re-enabled by policy.
1754 for (base::ListValue::const_iterator it = switches->begin(); 1754 for (base::ListValue::const_iterator it = switches->begin();
1755 it != switches->end(); ++it) { 1755 it != switches->end(); ++it) {
1756 std::string switch_to_enable; 1756 std::string switch_to_enable;
1757 if ((*it)->GetAsString(&switch_to_enable)) 1757 if (it->GetAsString(&switch_to_enable))
1758 command_line->AppendSwitch(switch_to_enable); 1758 command_line->AppendSwitch(switch_to_enable);
1759 } 1759 }
1760 } 1760 }
1761 1761
1762 // Disable client-side phishing detection in the renderer if it is 1762 // Disable client-side phishing detection in the renderer if it is
1763 // disabled in the Profile preferences or the browser process. 1763 // disabled in the Profile preferences or the browser process.
1764 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || 1764 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
1765 !g_browser_process->safe_browsing_detection_service()) { 1765 !g_browser_process->safe_browsing_detection_service()) {
1766 command_line->AppendSwitch( 1766 command_line->AppendSwitch(
1767 switches::kDisableClientSidePhishingDetection); 1767 switches::kDisableClientSidePhishingDetection);
(...skipping 1787 matching lines...) Expand 10 before | Expand all | Expand 10 after
3555 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3555 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3556 return variations::GetVariationParamValue( 3556 return variations::GetVariationParamValue(
3557 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3557 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3558 } 3558 }
3559 3559
3560 // static 3560 // static
3561 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3561 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3562 const storage::QuotaSettings* settings) { 3562 const storage::QuotaSettings* settings) {
3563 g_default_quota_settings = settings; 3563 g_default_quota_settings = settings;
3564 } 3564 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698