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

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: dgrogan comments #2, mihai comments #1 Created 9 years, 6 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 15 matching lines...) Expand all
26 #include "chrome/browser/defaults.h" 26 #include "chrome/browser/defaults.h"
27 #include "chrome/browser/download/download_manager.h" 27 #include "chrome/browser/download/download_manager.h"
28 #include "chrome/browser/extensions/extension_devtools_manager.h" 28 #include "chrome/browser/extensions/extension_devtools_manager.h"
29 #include "chrome/browser/extensions/extension_error_reporter.h" 29 #include "chrome/browser/extensions/extension_error_reporter.h"
30 #include "chrome/browser/extensions/extension_event_router.h" 30 #include "chrome/browser/extensions/extension_event_router.h"
31 #include "chrome/browser/extensions/extension_info_map.h" 31 #include "chrome/browser/extensions/extension_info_map.h"
32 #include "chrome/browser/extensions/extension_message_service.h" 32 #include "chrome/browser/extensions/extension_message_service.h"
33 #include "chrome/browser/extensions/extension_pref_store.h" 33 #include "chrome/browser/extensions/extension_pref_store.h"
34 #include "chrome/browser/extensions/extension_process_manager.h" 34 #include "chrome/browser/extensions/extension_process_manager.h"
35 #include "chrome/browser/extensions/extension_service.h" 35 #include "chrome/browser/extensions/extension_service.h"
36 #include "chrome/browser/extensions/extension_settings.h"
36 #include "chrome/browser/extensions/extension_special_storage_policy.h" 37 #include "chrome/browser/extensions/extension_special_storage_policy.h"
37 #include "chrome/browser/extensions/user_script_master.h" 38 #include "chrome/browser/extensions/user_script_master.h"
38 #include "chrome/browser/favicon/favicon_service.h" 39 #include "chrome/browser/favicon/favicon_service.h"
39 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 40 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
40 #include "chrome/browser/history/history.h" 41 #include "chrome/browser/history/history.h"
41 #include "chrome/browser/history/top_sites.h" 42 #include "chrome/browser/history/top_sites.h"
42 #include "chrome/browser/instant/instant_controller.h" 43 #include "chrome/browser/instant/instant_controller.h"
43 #include "chrome/browser/metrics/metrics_service.h" 44 #include "chrome/browser/metrics/metrics_service.h"
44 #include "chrome/browser/net/chrome_url_request_context.h" 45 #include "chrome/browser/net/chrome_url_request_context.h"
45 #include "chrome/browser/net/gaia/token_service.h" 46 #include "chrome/browser/net/gaia/token_service.h"
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 if (!extensions_enabled) 456 if (!extensions_enabled)
456 autoupdate_enabled = false; 457 autoupdate_enabled = false;
457 else 458 else
458 autoupdate_enabled = !command_line->HasSwitch(switches::kGuestSession); 459 autoupdate_enabled = !command_line->HasSwitch(switches::kGuestSession);
459 #endif 460 #endif
460 extension_service_.reset(new ExtensionService( 461 extension_service_.reset(new ExtensionService(
461 this, 462 this,
462 CommandLine::ForCurrentProcess(), 463 CommandLine::ForCurrentProcess(),
463 GetPath().AppendASCII(ExtensionService::kInstallDirectoryName), 464 GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
464 extension_prefs_.get(), 465 extension_prefs_.get(),
466 extension_settings_.get(),
465 autoupdate_enabled, 467 autoupdate_enabled,
466 extensions_enabled)); 468 extensions_enabled));
467 469
468 RegisterComponentExtensions(); 470 RegisterComponentExtensions();
469 extension_service_->Init(); 471 extension_service_->Init();
470 472
471 if (extensions_enabled) { 473 if (extensions_enabled) {
472 // Load any extensions specified with --load-extension. 474 // Load any extensions specified with --load-extension.
473 if (command_line->HasSwitch(switches::kLoadExtension)) { 475 if (command_line->HasSwitch(switches::kLoadExtension)) {
474 FilePath path = command_line->GetSwitchValuePath( 476 FilePath path = command_line->GetSwitchValuePath(
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 // Make sure we save to disk that the session has opened. 818 // Make sure we save to disk that the session has opened.
817 prefs_->ScheduleSavePersistentPrefs(); 819 prefs_->ScheduleSavePersistentPrefs();
818 820
819 // Ensure that preferences set by extensions are restored in the profile 821 // Ensure that preferences set by extensions are restored in the profile
820 // as early as possible. The constructor takes care of that. 822 // as early as possible. The constructor takes care of that.
821 extension_prefs_.reset(new ExtensionPrefs( 823 extension_prefs_.reset(new ExtensionPrefs(
822 prefs_.get(), 824 prefs_.get(),
823 GetPath().AppendASCII(ExtensionService::kInstallDirectoryName), 825 GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
824 GetExtensionPrefValueMap())); 826 GetExtensionPrefValueMap()));
825 827
828 extension_settings_.reset(new ExtensionSettings(
829 GetPath().AppendASCII(ExtensionService::kSettingsDirectoryName)));
830
826 DCHECK(!net_pref_observer_.get()); 831 DCHECK(!net_pref_observer_.get());
827 net_pref_observer_.reset( 832 net_pref_observer_.reset(
828 new NetPrefObserver(prefs_.get(), GetPrerenderManager())); 833 new NetPrefObserver(prefs_.get(), GetPrerenderManager()));
829 834
830 DoFinalInit(); 835 DoFinalInit();
831 } 836 }
832 837
833 PrefService* ProfileImpl::GetPrefs() { 838 PrefService* ProfileImpl::GetPrefs() {
834 DCHECK(prefs_.get()); // Should explicitly be initialized. 839 DCHECK(prefs_.get()); // Should explicitly be initialized.
835 return prefs_.get(); 840 return prefs_.get();
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
1637 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1642 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1638 return NULL; 1643 return NULL;
1639 if (!prerender_manager_.get()) { 1644 if (!prerender_manager_.get()) {
1640 CHECK(g_browser_process->prerender_tracker()); 1645 CHECK(g_browser_process->prerender_tracker());
1641 prerender_manager_.reset( 1646 prerender_manager_.reset(
1642 new prerender::PrerenderManager( 1647 new prerender::PrerenderManager(
1643 this, g_browser_process->prerender_tracker())); 1648 this, g_browser_process->prerender_tracker()));
1644 } 1649 }
1645 return prerender_manager_.get(); 1650 return prerender_manager_.get();
1646 } 1651 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698