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

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

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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/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 22 matching lines...) Expand all
33 #include "chrome/browser/net/proxy_service_factory.h" 33 #include "chrome/browser/net/proxy_service_factory.h"
34 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" 34 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
35 #include "chrome/browser/plugins/plugin_prefs.h" 35 #include "chrome/browser/plugins/plugin_prefs.h"
36 #include "chrome/browser/prefs/incognito_mode_prefs.h" 36 #include "chrome/browser/prefs/incognito_mode_prefs.h"
37 #include "chrome/browser/prefs/pref_service_syncable.h" 37 #include "chrome/browser/prefs/pref_service_syncable.h"
38 #include "chrome/browser/themes/theme_service.h" 38 #include "chrome/browser/themes/theme_service.h"
39 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 39 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
40 #include "chrome/common/chrome_constants.h" 40 #include "chrome/common/chrome_constants.h"
41 #include "chrome/common/chrome_paths.h" 41 #include "chrome/common/chrome_paths.h"
42 #include "chrome/common/chrome_switches.h" 42 #include "chrome/common/chrome_switches.h"
43 #include "chrome/common/extensions/extension.h"
44 #include "chrome/common/pref_names.h" 43 #include "chrome/common/pref_names.h"
45 #include "chrome/common/render_messages.h" 44 #include "chrome/common/render_messages.h"
46 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h" 45 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"
47 #include "components/user_prefs/user_prefs.h" 46 #include "components/user_prefs/user_prefs.h"
48 #include "content/public/browser/browser_thread.h" 47 #include "content/public/browser/browser_thread.h"
49 #include "content/public/browser/host_zoom_map.h" 48 #include "content/public/browser/host_zoom_map.h"
50 #include "content/public/browser/render_process_host.h" 49 #include "content/public/browser/render_process_host.h"
51 #include "content/public/browser/storage_partition.h" 50 #include "content/public/browser/storage_partition.h"
52 #include "content/public/browser/url_data_source.h" 51 #include "content/public/browser/url_data_source.h"
53 #include "content/public/browser/web_contents.h" 52 #include "content/public/browser/web_contents.h"
53 #include "extensions/common/extension.h"
54 #include "net/http/http_server_properties.h" 54 #include "net/http/http_server_properties.h"
55 #include "net/http/transport_security_state.h" 55 #include "net/http/transport_security_state.h"
56 #include "webkit/browser/database/database_tracker.h" 56 #include "webkit/browser/database/database_tracker.h"
57 57
58 #if defined(OS_ANDROID) || defined(OS_IOS) 58 #if defined(OS_ANDROID) || defined(OS_IOS)
59 #include "base/prefs/scoped_user_pref_update.h" 59 #include "base/prefs/scoped_user_pref_update.h"
60 #include "chrome/browser/prefs/proxy_prefs.h" 60 #include "chrome/browser/prefs/proxy_prefs.h"
61 #endif // defined(OS_ANDROID) || defined(OS_IOS) 61 #endif // defined(OS_ANDROID) || defined(OS_IOS)
62 62
63 #if defined(OS_CHROMEOS) 63 #if defined(OS_CHROMEOS)
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 504 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
505 #if defined(OS_CHROMEOS) 505 #if defined(OS_CHROMEOS)
506 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 506 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
507 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 507 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
508 g_browser_process->local_state()); 508 g_browser_process->local_state());
509 } 509 }
510 #endif // defined(OS_CHROMEOS) 510 #endif // defined(OS_CHROMEOS)
511 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 511 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
512 GetPrefs(), g_browser_process->local_state()); 512 GetPrefs(), g_browser_process->local_state());
513 } 513 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698