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

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

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ui_zoom stuff to components instead. Created 6 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
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 15 matching lines...) Expand all
26 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator. h" 26 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator. h"
27 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" 27 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
28 #include "chrome/browser/plugins/plugin_prefs.h" 28 #include "chrome/browser/plugins/plugin_prefs.h"
29 #include "chrome/browser/prefs/incognito_mode_prefs.h" 29 #include "chrome/browser/prefs/incognito_mode_prefs.h"
30 #include "chrome/browser/prefs/pref_service_syncable.h" 30 #include "chrome/browser/prefs/pref_service_syncable.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" 33 #include "chrome/browser/themes/theme_service.h"
34 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 34 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
35 #include "chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h" 35 #include "chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h"
36 #include "chrome/browser/ui/zoom/zoom_event_manager.h"
37 #include "chrome/common/chrome_constants.h" 36 #include "chrome/common/chrome_constants.h"
38 #include "chrome/common/chrome_paths.h" 37 #include "chrome/common/chrome_paths.h"
39 #include "chrome/common/chrome_switches.h" 38 #include "chrome/common/chrome_switches.h"
40 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
41 #include "chrome/common/render_messages.h" 40 #include "chrome/common/render_messages.h"
42 #include "components/content_settings/core/browser/host_content_settings_map.h" 41 #include "components/content_settings/core/browser/host_content_settings_map.h"
43 #include "components/keyed_service/content/browser_context_dependency_manager.h" 42 #include "components/keyed_service/content/browser_context_dependency_manager.h"
43 #include "components/ui/zoom/zoom_event_manager.h"
44 #include "components/user_prefs/user_prefs.h" 44 #include "components/user_prefs/user_prefs.h"
45 #include "content/public/browser/browser_thread.h" 45 #include "content/public/browser/browser_thread.h"
46 #include "content/public/browser/host_zoom_map.h" 46 #include "content/public/browser/host_zoom_map.h"
47 #include "content/public/browser/render_process_host.h" 47 #include "content/public/browser/render_process_host.h"
48 #include "content/public/browser/storage_partition.h" 48 #include "content/public/browser/storage_partition.h"
49 #include "content/public/browser/url_data_source.h" 49 #include "content/public/browser/url_data_source.h"
50 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
51 #include "net/http/http_server_properties.h" 51 #include "net/http/http_server_properties.h"
52 #include "net/http/transport_security_state.h" 52 #include "net/http/transport_security_state.h"
53 #include "storage/browser/database/database_tracker.h" 53 #include "storage/browser/database/database_tracker.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 } 231 }
232 232
233 base::FilePath OffTheRecordProfileImpl::GetPath() const { 233 base::FilePath OffTheRecordProfileImpl::GetPath() const {
234 return profile_->GetPath(); 234 return profile_->GetPath();
235 } 235 }
236 236
237 scoped_ptr<content::ZoomLevelDelegate> 237 scoped_ptr<content::ZoomLevelDelegate>
238 OffTheRecordProfileImpl::CreateZoomLevelDelegate( 238 OffTheRecordProfileImpl::CreateZoomLevelDelegate(
239 const base::FilePath& partition_path) { 239 const base::FilePath& partition_path) {
240 return make_scoped_ptr(new chrome::ChromeZoomLevelOTRDelegate( 240 return make_scoped_ptr(new chrome::ChromeZoomLevelOTRDelegate(
241 ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr())); 241 components::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr()));
242 } 242 }
243 243
244 scoped_refptr<base::SequencedTaskRunner> 244 scoped_refptr<base::SequencedTaskRunner>
245 OffTheRecordProfileImpl::GetIOTaskRunner() { 245 OffTheRecordProfileImpl::GetIOTaskRunner() {
246 return profile_->GetIOTaskRunner(); 246 return profile_->GetIOTaskRunner();
247 } 247 }
248 248
249 bool OffTheRecordProfileImpl::IsOffTheRecord() const { 249 bool OffTheRecordProfileImpl::IsOffTheRecord() const {
250 return true; 250 return true;
251 } 251 }
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 547 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
548 #if defined(OS_CHROMEOS) 548 #if defined(OS_CHROMEOS)
549 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 549 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
550 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 550 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
551 g_browser_process->local_state()); 551 g_browser_process->local_state());
552 } 552 }
553 #endif // defined(OS_CHROMEOS) 553 #endif // defined(OS_CHROMEOS)
554 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 554 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
555 GetPrefs(), g_browser_process->local_state()); 555 GetPrefs(), g_browser_process->local_state());
556 } 556 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698