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

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

Issue 6591034: Move core pieces of geolocation from chrome to content.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix Linux build Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 22 matching lines...) Expand all
33 #include "chrome/browser/extensions/extension_info_map.h" 33 #include "chrome/browser/extensions/extension_info_map.h"
34 #include "chrome/browser/extensions/extension_io_event_router.h" 34 #include "chrome/browser/extensions/extension_io_event_router.h"
35 #include "chrome/browser/extensions/extension_message_service.h" 35 #include "chrome/browser/extensions/extension_message_service.h"
36 #include "chrome/browser/extensions/extension_pref_store.h" 36 #include "chrome/browser/extensions/extension_pref_store.h"
37 #include "chrome/browser/extensions/extension_process_manager.h" 37 #include "chrome/browser/extensions/extension_process_manager.h"
38 #include "chrome/browser/extensions/extension_service.h" 38 #include "chrome/browser/extensions/extension_service.h"
39 #include "chrome/browser/extensions/extension_special_storage_policy.h" 39 #include "chrome/browser/extensions/extension_special_storage_policy.h"
40 #include "chrome/browser/extensions/user_script_master.h" 40 #include "chrome/browser/extensions/user_script_master.h"
41 #include "chrome/browser/favicon_service.h" 41 #include "chrome/browser/favicon_service.h"
42 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 42 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
43 #include "chrome/browser/geolocation/geolocation_permission_context.h"
44 #include "chrome/browser/history/history.h" 43 #include "chrome/browser/history/history.h"
45 #include "chrome/browser/history/top_sites.h" 44 #include "chrome/browser/history/top_sites.h"
46 #include "chrome/browser/instant/instant_controller.h" 45 #include "chrome/browser/instant/instant_controller.h"
47 #include "chrome/browser/net/chrome_url_request_context.h" 46 #include "chrome/browser/net/chrome_url_request_context.h"
48 #include "chrome/browser/net/gaia/token_service.h" 47 #include "chrome/browser/net/gaia/token_service.h"
49 #include "chrome/browser/net/net_pref_observer.h" 48 #include "chrome/browser/net/net_pref_observer.h"
50 #include "chrome/browser/net/pref_proxy_config_service.h" 49 #include "chrome/browser/net/pref_proxy_config_service.h"
51 #include "chrome/browser/net/ssl_config_service_manager.h" 50 #include "chrome/browser/net/ssl_config_service_manager.h"
52 #include "chrome/browser/notifications/desktop_notification_service.h" 51 #include "chrome/browser/notifications/desktop_notification_service.h"
53 #include "chrome/browser/password_manager/password_store_default.h" 52 #include "chrome/browser/password_manager/password_store_default.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 #include "chrome/common/chrome_paths_internal.h" 84 #include "chrome/common/chrome_paths_internal.h"
86 #include "chrome/common/chrome_switches.h" 85 #include "chrome/common/chrome_switches.h"
87 #include "chrome/common/json_pref_store.h" 86 #include "chrome/common/json_pref_store.h"
88 #include "chrome/common/notification_service.h" 87 #include "chrome/common/notification_service.h"
89 #include "chrome/common/pref_names.h" 88 #include "chrome/common/pref_names.h"
90 #include "chrome/common/render_messages.h" 89 #include "chrome/common/render_messages.h"
91 #include "content/browser/appcache/chrome_appcache_service.h" 90 #include "content/browser/appcache/chrome_appcache_service.h"
92 #include "content/browser/browser_thread.h" 91 #include "content/browser/browser_thread.h"
93 #include "content/browser/chrome_blob_storage_context.h" 92 #include "content/browser/chrome_blob_storage_context.h"
94 #include "content/browser/file_system/browser_file_system_helper.h" 93 #include "content/browser/file_system/browser_file_system_helper.h"
94 #include "content/browser/geolocation/geolocation_permission_context.h"
95 #include "content/browser/host_zoom_map.h" 95 #include "content/browser/host_zoom_map.h"
96 #include "content/browser/in_process_webkit/webkit_context.h" 96 #include "content/browser/in_process_webkit/webkit_context.h"
97 #include "grit/browser_resources.h" 97 #include "grit/browser_resources.h"
98 #include "grit/locale_settings.h" 98 #include "grit/locale_settings.h"
99 #include "net/base/transport_security_state.h" 99 #include "net/base/transport_security_state.h"
100 #include "ui/base/resource/resource_bundle.h" 100 #include "ui/base/resource/resource_bundle.h"
101 #include "webkit/database/database_tracker.h" 101 #include "webkit/database/database_tracker.h"
102 102
103 #if defined(TOOLKIT_USES_GTK) 103 #if defined(TOOLKIT_USES_GTK)
104 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 104 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
(...skipping 1423 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 return pref_proxy_config_tracker_; 1528 return pref_proxy_config_tracker_;
1529 } 1529 }
1530 1530
1531 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1531 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1532 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) 1532 if (!prerender::PrerenderManager::IsPrerenderingEnabled())
1533 return NULL; 1533 return NULL;
1534 if (!prerender_manager_) 1534 if (!prerender_manager_)
1535 prerender_manager_ = new prerender::PrerenderManager(this); 1535 prerender_manager_ = new prerender::PrerenderManager(this);
1536 return prerender_manager_; 1536 return prerender_manager_;
1537 } 1537 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698