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

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: Merge to head again, previous had unrelated broken win_rel test. 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 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 406
407 ChromeContentBrowserClient::ChromeContentBrowserClient() { 407 ChromeContentBrowserClient::ChromeContentBrowserClient() {
408 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i) 408 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
409 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]); 409 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
410 } 410 }
411 411
412 ChromeContentBrowserClient::~ChromeContentBrowserClient() { 412 ChromeContentBrowserClient::~ChromeContentBrowserClient() {
413 } 413 }
414 414
415 // static 415 // static
416 void ChromeContentBrowserClient::RegisterUserPrefs(PrefService* prefs) { 416 void ChromeContentBrowserClient::RegisterUserPrefs(PrefServiceSyncable* prefs) {
417 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, 417 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs,
418 false, 418 false,
419 PrefService::UNSYNCABLE_PREF); 419 PrefServiceSyncable::UNSYNCABLE_PREF);
420 prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, 420 prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing,
421 true, 421 true,
422 PrefService::UNSYNCABLE_PREF); 422 PrefServiceSyncable::UNSYNCABLE_PREF);
423 prefs->RegisterBooleanPref(prefs::kEnableMemoryInfo, 423 prefs->RegisterBooleanPref(prefs::kEnableMemoryInfo,
424 false, 424 false,
425 PrefService::UNSYNCABLE_PREF); 425 PrefServiceSyncable::UNSYNCABLE_PREF);
426 } 426 }
427 427
428 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts( 428 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
429 const content::MainFunctionParams& parameters) { 429 const content::MainFunctionParams& parameters) {
430 ChromeBrowserMainParts* main_parts; 430 ChromeBrowserMainParts* main_parts;
431 // Construct the Main browser parts based on the OS type. 431 // Construct the Main browser parts based on the OS type.
432 #if defined(OS_WIN) 432 #if defined(OS_WIN)
433 main_parts = new ChromeBrowserMainPartsWin(parameters); 433 main_parts = new ChromeBrowserMainPartsWin(parameters);
434 #elif defined(OS_MACOSX) 434 #elif defined(OS_MACOSX)
435 main_parts = new ChromeBrowserMainPartsMac(parameters); 435 main_parts = new ChromeBrowserMainPartsMac(parameters);
(...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1929 io_thread_application_locale_ = locale; 1929 io_thread_application_locale_ = locale;
1930 } 1930 }
1931 1931
1932 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 1932 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
1933 const std::string& locale) { 1933 const std::string& locale) {
1934 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 1934 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
1935 io_thread_application_locale_ = locale; 1935 io_thread_application_locale_ = locale;
1936 } 1936 }
1937 1937
1938 } // namespace chrome 1938 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chrome_to_mobile_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698