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

Side by Side Diff: chrome/browser/extensions/extension_service.cc

Issue 545413002: Detach the dependency from host_content_settings_map to extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years, 3 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/extensions/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <set> 9 #include <set>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/threading/sequenced_worker_pool.h" 16 #include "base/threading/sequenced_worker_pool.h"
17 #include "base/threading/thread_restrictions.h" 17 #include "base/threading/thread_restrictions.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/chrome_notification_types.h" 20 #include "chrome/browser/chrome_notification_types.h"
21 #include "chrome/browser/content_settings/content_settings_custom_extension_prov ider.h"
22 #include "chrome/browser/content_settings/content_settings_internal_extension_pr ovider.h"
23 #include "chrome/browser/content_settings/host_content_settings_map.h"
24 #include "chrome/browser/extensions/api/content_settings/content_settings_servic e.h"
21 #include "chrome/browser/extensions/component_loader.h" 25 #include "chrome/browser/extensions/component_loader.h"
22 #include "chrome/browser/extensions/crx_installer.h" 26 #include "chrome/browser/extensions/crx_installer.h"
23 #include "chrome/browser/extensions/data_deleter.h" 27 #include "chrome/browser/extensions/data_deleter.h"
24 #include "chrome/browser/extensions/extension_action_storage_manager.h" 28 #include "chrome/browser/extensions/extension_action_storage_manager.h"
25 #include "chrome/browser/extensions/extension_assets_manager.h" 29 #include "chrome/browser/extensions/extension_assets_manager.h"
26 #include "chrome/browser/extensions/extension_disabled_ui.h" 30 #include "chrome/browser/extensions/extension_disabled_ui.h"
27 #include "chrome/browser/extensions/extension_error_controller.h" 31 #include "chrome/browser/extensions/extension_error_controller.h"
28 #include "chrome/browser/extensions/extension_install_ui.h" 32 #include "chrome/browser/extensions/extension_install_ui.h"
29 #include "chrome/browser/extensions/extension_special_storage_policy.h" 33 #include "chrome/browser/extensions/extension_special_storage_policy.h"
30 #include "chrome/browser/extensions/extension_sync_service.h" 34 #include "chrome/browser/extensions/extension_sync_service.h"
(...skipping 1877 matching lines...) Expand 10 before | Expand all | Expand 10 after
1908 1912
1909 if (!is_from_sync && extension_sync_service_) 1913 if (!is_from_sync && extension_sync_service_)
1910 extension_sync_service_->SyncExtensionChangeIfNeeded(*extension); 1914 extension_sync_service_->SyncExtensionChangeIfNeeded(*extension);
1911 } 1915 }
1912 1916
1913 const Extension* ExtensionService::GetPendingExtensionUpdate( 1917 const Extension* ExtensionService::GetPendingExtensionUpdate(
1914 const std::string& id) const { 1918 const std::string& id) const {
1915 return delayed_installs_.GetByID(id); 1919 return delayed_installs_.GetByID(id);
1916 } 1920 }
1917 1921
1922 void ExtensionService::RegisterContentSettings(
1923 HostContentSettingsMap* host_content_settings_map) {
1924 host_content_settings_map->RegisterProvider(
1925 HostContentSettingsMap::INTERNAL_EXTENSION_PROVIDER,
1926 scoped_ptr<content_settings::ObservableProvider>(
1927 new content_settings::InternalExtensionProvider(this)));
1928
1929 host_content_settings_map->RegisterProvider(
1930 HostContentSettingsMap::CUSTOM_EXTENSION_PROVIDER,
1931 scoped_ptr<content_settings::ObservableProvider>(
1932 new content_settings::CustomExtensionProvider(
1933 extensions::ContentSettingsService::Get(
1934 profile_)->content_settings_store(),
1935 profile_->GetOriginalProfile() != profile_)));
1936 }
1937
1918 void ExtensionService::TrackTerminatedExtension(const Extension* extension) { 1938 void ExtensionService::TrackTerminatedExtension(const Extension* extension) {
1919 // No need to check for duplicates; inserting a duplicate is a no-op. 1939 // No need to check for duplicates; inserting a duplicate is a no-op.
1920 registry_->AddTerminated(make_scoped_refptr(extension)); 1940 registry_->AddTerminated(make_scoped_refptr(extension));
1921 extensions_being_terminated_.erase(extension->id()); 1941 extensions_being_terminated_.erase(extension->id());
1922 UnloadExtension(extension->id(), UnloadedExtensionInfo::REASON_TERMINATE); 1942 UnloadExtension(extension->id(), UnloadedExtensionInfo::REASON_TERMINATE);
1923 } 1943 }
1924 1944
1925 void ExtensionService::TerminateExtension(const std::string& extension_id) { 1945 void ExtensionService::TerminateExtension(const std::string& extension_id) {
1926 const Extension* extension = GetInstalledExtension(extension_id); 1946 const Extension* extension = GetInstalledExtension(extension_id);
1927 TrackTerminatedExtension(extension); 1947 TrackTerminatedExtension(extension);
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
2354 } 2374 }
2355 2375
2356 void ExtensionService::OnProfileDestructionStarted() { 2376 void ExtensionService::OnProfileDestructionStarted() {
2357 ExtensionIdSet ids_to_unload = registry_->enabled_extensions().GetIDs(); 2377 ExtensionIdSet ids_to_unload = registry_->enabled_extensions().GetIDs();
2358 for (ExtensionIdSet::iterator it = ids_to_unload.begin(); 2378 for (ExtensionIdSet::iterator it = ids_to_unload.begin();
2359 it != ids_to_unload.end(); 2379 it != ids_to_unload.end();
2360 ++it) { 2380 ++it) {
2361 UnloadExtension(*it, UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN); 2381 UnloadExtension(*it, UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN);
2362 } 2382 }
2363 } 2383 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698