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

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: Fix Android Compilation Error 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 1745 matching lines...) Expand 10 before | Expand all | Expand 10 after
1756 command_line->AppendSwitch(switches::kDisable3DAPIs); 1756 command_line->AppendSwitch(switches::kDisable3DAPIs);
1757 } 1757 }
1758 1758
1759 const base::ListValue* switches = 1759 const base::ListValue* switches =
1760 prefs->GetList(prefs::kEnableDeprecatedWebPlatformFeatures); 1760 prefs->GetList(prefs::kEnableDeprecatedWebPlatformFeatures);
1761 if (switches) { 1761 if (switches) {
1762 // Enable any deprecated features that have been re-enabled by policy. 1762 // Enable any deprecated features that have been re-enabled by policy.
1763 for (base::ListValue::const_iterator it = switches->begin(); 1763 for (base::ListValue::const_iterator it = switches->begin();
1764 it != switches->end(); ++it) { 1764 it != switches->end(); ++it) {
1765 std::string switch_to_enable; 1765 std::string switch_to_enable;
1766 if ((*it)->GetAsString(&switch_to_enable)) 1766 if (it->GetAsString(&switch_to_enable))
1767 command_line->AppendSwitch(switch_to_enable); 1767 command_line->AppendSwitch(switch_to_enable);
1768 } 1768 }
1769 } 1769 }
1770 1770
1771 // Disable client-side phishing detection in the renderer if it is 1771 // Disable client-side phishing detection in the renderer if it is
1772 // disabled in the Profile preferences or the browser process. 1772 // disabled in the Profile preferences or the browser process.
1773 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || 1773 if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
1774 !g_browser_process->safe_browsing_detection_service()) { 1774 !g_browser_process->safe_browsing_detection_service()) {
1775 command_line->AppendSwitch( 1775 command_line->AppendSwitch(
1776 switches::kDisableClientSidePhishingDetection); 1776 switches::kDisableClientSidePhishingDetection);
(...skipping 1794 matching lines...) Expand 10 before | Expand all | Expand 10 after
3571 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3571 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3572 return variations::GetVariationParamValue( 3572 return variations::GetVariationParamValue(
3573 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3573 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3574 } 3574 }
3575 3575
3576 // static 3576 // static
3577 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3577 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3578 const storage::QuotaSettings* settings) { 3578 const storage::QuotaSettings* settings) {
3579 g_default_quota_settings = settings; 3579 g_default_quota_settings = settings;
3580 } 3580 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698