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

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

Issue 7189029: Implement an initial extension settings API. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Change to RefCountedThreadSafe Created 9 years, 4 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 17 matching lines...) Expand all
28 #include "chrome/browser/download/chrome_download_manager_delegate.h" 28 #include "chrome/browser/download/chrome_download_manager_delegate.h"
29 #include "chrome/browser/download/download_manager.h" 29 #include "chrome/browser/download/download_manager.h"
30 #include "chrome/browser/extensions/extension_devtools_manager.h" 30 #include "chrome/browser/extensions/extension_devtools_manager.h"
31 #include "chrome/browser/extensions/extension_error_reporter.h" 31 #include "chrome/browser/extensions/extension_error_reporter.h"
32 #include "chrome/browser/extensions/extension_event_router.h" 32 #include "chrome/browser/extensions/extension_event_router.h"
33 #include "chrome/browser/extensions/extension_info_map.h" 33 #include "chrome/browser/extensions/extension_info_map.h"
34 #include "chrome/browser/extensions/extension_message_service.h" 34 #include "chrome/browser/extensions/extension_message_service.h"
35 #include "chrome/browser/extensions/extension_pref_store.h" 35 #include "chrome/browser/extensions/extension_pref_store.h"
36 #include "chrome/browser/extensions/extension_process_manager.h" 36 #include "chrome/browser/extensions/extension_process_manager.h"
37 #include "chrome/browser/extensions/extension_service.h" 37 #include "chrome/browser/extensions/extension_service.h"
38 #include "chrome/browser/extensions/extension_settings.h"
38 #include "chrome/browser/extensions/extension_special_storage_policy.h" 39 #include "chrome/browser/extensions/extension_special_storage_policy.h"
39 #include "chrome/browser/extensions/user_script_master.h" 40 #include "chrome/browser/extensions/user_script_master.h"
40 #include "chrome/browser/favicon/favicon_service.h" 41 #include "chrome/browser/favicon/favicon_service.h"
41 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" 42 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
42 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 43 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
43 #include "chrome/browser/history/history.h" 44 #include "chrome/browser/history/history.h"
44 #include "chrome/browser/history/shortcuts_backend.h" 45 #include "chrome/browser/history/shortcuts_backend.h"
45 #include "chrome/browser/history/top_sites.h" 46 #include "chrome/browser/history/top_sites.h"
46 #include "chrome/browser/instant/instant_controller.h" 47 #include "chrome/browser/instant/instant_controller.h"
47 #include "chrome/browser/metrics/metrics_service.h" 48 #include "chrome/browser/metrics/metrics_service.h"
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 if (!extensions_enabled) 474 if (!extensions_enabled)
474 autoupdate_enabled = false; 475 autoupdate_enabled = false;
475 else 476 else
476 autoupdate_enabled = !command_line->HasSwitch(switches::kGuestSession); 477 autoupdate_enabled = !command_line->HasSwitch(switches::kGuestSession);
477 #endif 478 #endif
478 extension_service_.reset(new ExtensionService( 479 extension_service_.reset(new ExtensionService(
479 this, 480 this,
480 CommandLine::ForCurrentProcess(), 481 CommandLine::ForCurrentProcess(),
481 GetPath().AppendASCII(ExtensionService::kInstallDirectoryName), 482 GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
482 extension_prefs_.get(), 483 extension_prefs_.get(),
484 extension_settings_.get(),
483 autoupdate_enabled, 485 autoupdate_enabled,
484 extensions_enabled)); 486 extensions_enabled));
485 487
486 RegisterComponentExtensions(); 488 RegisterComponentExtensions();
487 extension_service_->Init(); 489 extension_service_->Init();
488 490
489 if (extensions_enabled) { 491 if (extensions_enabled) {
490 // Load any extensions specified with --load-extension. 492 // Load any extensions specified with --load-extension.
491 if (command_line->HasSwitch(switches::kLoadExtension)) { 493 if (command_line->HasSwitch(switches::kLoadExtension)) {
492 FilePath path = command_line->GetSwitchValuePath( 494 FilePath path = command_line->GetSwitchValuePath(
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 // Make sure we save to disk that the session has opened. 893 // Make sure we save to disk that the session has opened.
892 prefs_->ScheduleSavePersistentPrefs(); 894 prefs_->ScheduleSavePersistentPrefs();
893 895
894 // Ensure that preferences set by extensions are restored in the profile 896 // Ensure that preferences set by extensions are restored in the profile
895 // as early as possible. The constructor takes care of that. 897 // as early as possible. The constructor takes care of that.
896 extension_prefs_.reset(new ExtensionPrefs( 898 extension_prefs_.reset(new ExtensionPrefs(
897 prefs_.get(), 899 prefs_.get(),
898 GetPath().AppendASCII(ExtensionService::kInstallDirectoryName), 900 GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
899 GetExtensionPrefValueMap())); 901 GetExtensionPrefValueMap()));
900 902
903 extension_settings_ = new ExtensionSettings(
904 GetPath().AppendASCII(ExtensionService::kSettingsDirectoryName));
905
901 ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false); 906 ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);
902 907
903 DCHECK(!net_pref_observer_.get()); 908 DCHECK(!net_pref_observer_.get());
904 net_pref_observer_.reset( 909 net_pref_observer_.reset(
905 new NetPrefObserver(prefs_.get(), GetPrerenderManager())); 910 new NetPrefObserver(prefs_.get(), GetPrerenderManager()));
906 911
907 DoFinalInit(); 912 DoFinalInit();
908 } 913 }
909 914
910 PrefService* ProfileImpl::GetPrefs() { 915 PrefService* ProfileImpl::GetPrefs() {
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 new prerender::PrerenderManager( 1755 new prerender::PrerenderManager(
1751 this, g_browser_process->prerender_tracker())); 1756 this, g_browser_process->prerender_tracker()));
1752 #if defined(OS_CHROMEOS) 1757 #if defined(OS_CHROMEOS)
1753 prerender_manager_->AddCondition( 1758 prerender_manager_->AddCondition(
1754 new chromeos::PrerenderConditionNetwork( 1759 new chromeos::PrerenderConditionNetwork(
1755 chromeos::CrosLibrary::Get()->GetNetworkLibrary())); 1760 chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
1756 #endif 1761 #endif
1757 } 1762 }
1758 return prerender_manager_.get(); 1763 return prerender_manager_.get();
1759 } 1764 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698