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

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: WIP, latest changes from kaiwang@ 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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 409
410 ChromeContentBrowserClient::ChromeContentBrowserClient() { 410 ChromeContentBrowserClient::ChromeContentBrowserClient() {
411 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i) 411 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
412 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]); 412 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
413 } 413 }
414 414
415 ChromeContentBrowserClient::~ChromeContentBrowserClient() { 415 ChromeContentBrowserClient::~ChromeContentBrowserClient() {
416 } 416 }
417 417
418 // static 418 // static
419 void ChromeContentBrowserClient::RegisterUserPrefs(PrefService* prefs) { 419 void ChromeContentBrowserClient::RegisterUserPrefs(PrefServiceSyncable* prefs) {
420 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, 420 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs,
421 false, 421 false,
422 PrefService::UNSYNCABLE_PREF); 422 PrefServiceSyncable::UNSYNCABLE_PREF);
423 prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, 423 prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing,
424 true, 424 true,
425 PrefService::UNSYNCABLE_PREF); 425 PrefServiceSyncable::UNSYNCABLE_PREF);
426 prefs->RegisterBooleanPref(prefs::kEnableMemoryInfo, 426 prefs->RegisterBooleanPref(prefs::kEnableMemoryInfo,
427 false, 427 false,
428 PrefService::UNSYNCABLE_PREF); 428 PrefServiceSyncable::UNSYNCABLE_PREF);
429 } 429 }
430 430
431 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts( 431 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
432 const content::MainFunctionParams& parameters) { 432 const content::MainFunctionParams& parameters) {
433 ChromeBrowserMainParts* main_parts; 433 ChromeBrowserMainParts* main_parts;
434 // Construct the Main browser parts based on the OS type. 434 // Construct the Main browser parts based on the OS type.
435 #if defined(OS_WIN) 435 #if defined(OS_WIN)
436 main_parts = new ChromeBrowserMainPartsWin(parameters); 436 main_parts = new ChromeBrowserMainPartsWin(parameters);
437 #elif defined(OS_MACOSX) 437 #elif defined(OS_MACOSX)
438 main_parts = new ChromeBrowserMainPartsMac(parameters); 438 main_parts = new ChromeBrowserMainPartsMac(parameters);
(...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1932 io_thread_application_locale_ = locale; 1932 io_thread_application_locale_ = locale;
1933 } 1933 }
1934 1934
1935 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 1935 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
1936 const std::string& locale) { 1936 const std::string& locale) {
1937 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 1937 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
1938 io_thread_application_locale_ = locale; 1938 io_thread_application_locale_ = locale;
1939 } 1939 }
1940 1940
1941 } // namespace chrome 1941 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698