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

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments. Created 8 years 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 407
408 ChromeContentBrowserClient::ChromeContentBrowserClient() { 408 ChromeContentBrowserClient::ChromeContentBrowserClient() {
409 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i) 409 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
410 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]); 410 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
411 } 411 }
412 412
413 ChromeContentBrowserClient::~ChromeContentBrowserClient() { 413 ChromeContentBrowserClient::~ChromeContentBrowserClient() {
414 } 414 }
415 415
416 // static 416 // static
417 void ChromeContentBrowserClient::RegisterUserPrefs(PrefService* prefs) { 417 void ChromeContentBrowserClient::RegisterUserPrefs(PrefServiceSyncable* prefs) {
418 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, 418 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs,
419 false, 419 false,
420 PrefService::UNSYNCABLE_PREF); 420 PrefServiceSyncable::UNSYNCABLE_PREF);
421 prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, 421 prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing,
422 true, 422 true,
423 PrefService::UNSYNCABLE_PREF); 423 PrefServiceSyncable::UNSYNCABLE_PREF);
424 prefs->RegisterBooleanPref(prefs::kEnableMemoryInfo, 424 prefs->RegisterBooleanPref(prefs::kEnableMemoryInfo,
425 false, 425 false,
426 PrefService::UNSYNCABLE_PREF); 426 PrefServiceSyncable::UNSYNCABLE_PREF);
427 } 427 }
428 428
429 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts( 429 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
430 const content::MainFunctionParams& parameters) { 430 const content::MainFunctionParams& parameters) {
431 ChromeBrowserMainParts* main_parts; 431 ChromeBrowserMainParts* main_parts;
432 // Construct the Main browser parts based on the OS type. 432 // Construct the Main browser parts based on the OS type.
433 #if defined(OS_WIN) 433 #if defined(OS_WIN)
434 main_parts = new ChromeBrowserMainPartsWin(parameters); 434 main_parts = new ChromeBrowserMainPartsWin(parameters);
435 #elif defined(OS_MACOSX) 435 #elif defined(OS_MACOSX)
436 main_parts = new ChromeBrowserMainPartsMac(parameters); 436 main_parts = new ChromeBrowserMainPartsMac(parameters);
(...skipping 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 io_thread_application_locale_ = locale; 1928 io_thread_application_locale_ = locale;
1929 } 1929 }
1930 1930
1931 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 1931 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
1932 const std::string& locale) { 1932 const std::string& locale) {
1933 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 1933 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
1934 io_thread_application_locale_ = locale; 1934 io_thread_application_locale_ = locale;
1935 } 1935 }
1936 1936
1937 } // namespace chrome 1937 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698