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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 991353003: Cleanup: Put more Themes code behind defined(ENABLE_THEMES). Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | chrome/browser/search/instant_service.h » ('j') | chrome/browser/search/instant_service.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/profiles/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/net/chrome_url_request_context_getter.h" 23 #include "chrome/browser/net/chrome_url_request_context_getter.h"
24 #include "chrome/browser/net/pref_proxy_config_tracker.h" 24 #include "chrome/browser/net/pref_proxy_config_tracker.h"
25 #include "chrome/browser/net/proxy_service_factory.h" 25 #include "chrome/browser/net/proxy_service_factory.h"
26 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" 26 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
27 #include "chrome/browser/plugins/plugin_prefs.h" 27 #include "chrome/browser/plugins/plugin_prefs.h"
28 #include "chrome/browser/prefs/incognito_mode_prefs.h" 28 #include "chrome/browser/prefs/incognito_mode_prefs.h"
29 #include "chrome/browser/prefs/pref_service_syncable.h" 29 #include "chrome/browser/prefs/pref_service_syncable.h"
30 #include "chrome/browser/profiles/profile_manager.h" 30 #include "chrome/browser/profiles/profile_manager.h"
31 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" 31 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
32 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h" 32 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
33 #include "chrome/browser/themes/theme_service.h"
34 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 33 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
35 #include "chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h" 34 #include "chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h"
36 #include "chrome/common/chrome_constants.h" 35 #include "chrome/common/chrome_constants.h"
37 #include "chrome/common/chrome_paths.h" 36 #include "chrome/common/chrome_paths.h"
38 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
39 #include "chrome/common/pref_names.h" 38 #include "chrome/common/pref_names.h"
40 #include "chrome/common/render_messages.h" 39 #include "chrome/common/render_messages.h"
41 #include "components/content_settings/core/browser/host_content_settings_map.h" 40 #include "components/content_settings/core/browser/host_content_settings_map.h"
42 #include "components/keyed_service/content/browser_context_dependency_manager.h" 41 #include "components/keyed_service/content/browser_context_dependency_manager.h"
43 #include "components/ui/zoom/zoom_event_manager.h" 42 #include "components/ui/zoom/zoom_event_manager.h"
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 583 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
585 #if defined(OS_CHROMEOS) 584 #if defined(OS_CHROMEOS)
586 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 585 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
587 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 586 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
588 g_browser_process->local_state()); 587 g_browser_process->local_state());
589 } 588 }
590 #endif // defined(OS_CHROMEOS) 589 #endif // defined(OS_CHROMEOS)
591 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 590 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
592 GetPrefs(), g_browser_process->local_state()); 591 GetPrefs(), g_browser_process->local_state());
593 } 592 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/search/instant_service.h » ('j') | chrome/browser/search/instant_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698