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

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

Issue 10837155: Persist browserAction settings to the extension StateStore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yoyo Created 8 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) 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/extensions/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 14 matching lines...) Expand all
25 #include "base/utf_string_conversions.h" 25 #include "base/utf_string_conversions.h"
26 #include "base/values.h" 26 #include "base/values.h"
27 #include "base/version.h" 27 #include "base/version.h"
28 #include "chrome/browser/accessibility/accessibility_extension_api.h" 28 #include "chrome/browser/accessibility/accessibility_extension_api.h"
29 #include "chrome/browser/bookmarks/bookmark_extension_api.h" 29 #include "chrome/browser/bookmarks/bookmark_extension_api.h"
30 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 30 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
31 #include "chrome/browser/browser_process.h" 31 #include "chrome/browser/browser_process.h"
32 #include "chrome/browser/chrome_plugin_service_filter.h" 32 #include "chrome/browser/chrome_plugin_service_filter.h"
33 #include "chrome/browser/extensions/api/cookies/cookies_api.h" 33 #include "chrome/browser/extensions/api/cookies/cookies_api.h"
34 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h" 34 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
35 #include "chrome/browser/extensions/api/extension_action/extension_actions_api.h "
35 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h" 36 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
36 #include "chrome/browser/extensions/api/managed_mode/managed_mode_api.h" 37 #include "chrome/browser/extensions/api/managed_mode/managed_mode_api.h"
37 #include "chrome/browser/extensions/api/management/management_api.h" 38 #include "chrome/browser/extensions/api/management/management_api.h"
38 #include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h" 39 #include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h"
39 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" 40 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
40 #include "chrome/browser/extensions/app_notification_manager.h" 41 #include "chrome/browser/extensions/app_notification_manager.h"
41 #include "chrome/browser/extensions/app_sync_data.h" 42 #include "chrome/browser/extensions/app_sync_data.h"
42 #include "chrome/browser/extensions/browser_event_router.h" 43 #include "chrome/browser/extensions/browser_event_router.h"
43 #include "chrome/browser/extensions/component_loader.h" 44 #include "chrome/browser/extensions/component_loader.h"
44 #include "chrome/browser/extensions/crx_installer.h" 45 #include "chrome/browser/extensions/crx_installer.h"
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 // Use monochrome icons for Omnibox icons. 395 // Use monochrome icons for Omnibox icons.
395 omnibox_popup_icon_manager_.set_monochrome(true); 396 omnibox_popup_icon_manager_.set_monochrome(true);
396 omnibox_icon_manager_.set_monochrome(true); 397 omnibox_icon_manager_.set_monochrome(true);
397 omnibox_icon_manager_.set_padding(gfx::Insets(0, kOmniboxIconPaddingLeft, 398 omnibox_icon_manager_.set_padding(gfx::Insets(0, kOmniboxIconPaddingLeft,
398 0, kOmniboxIconPaddingRight)); 399 0, kOmniboxIconPaddingRight));
399 400
400 // Set this as the ExtensionService for extension sorting to ensure it 401 // Set this as the ExtensionService for extension sorting to ensure it
401 // cause syncs if required. 402 // cause syncs if required.
402 extension_prefs_->extension_sorting()->SetExtensionService(this); 403 extension_prefs_->extension_sorting()->SetExtensionService(this);
403 404
405 extension_action_storage_manager_.reset(
406 new extensions::ExtensionActionStorageManager(profile_));
407
404 // How long is the path to the Extensions directory? 408 // How long is the path to the Extensions directory?
405 UMA_HISTOGRAM_CUSTOM_COUNTS("Extensions.ExtensionRootPathLength", 409 UMA_HISTOGRAM_CUSTOM_COUNTS("Extensions.ExtensionRootPathLength",
406 install_directory_.value().length(), 0, 500, 100); 410 install_directory_.value().length(), 0, 500, 100);
407 } 411 }
408 412
409 const ExtensionSet* ExtensionService::extensions() const { 413 const ExtensionSet* ExtensionService::extensions() const {
410 return &extensions_; 414 return &extensions_;
411 } 415 }
412 416
413 const ExtensionSet* ExtensionService::disabled_extensions() const { 417 const ExtensionSet* ExtensionService::disabled_extensions() const {
(...skipping 2132 matching lines...) Expand 10 before | Expand all | Expand 10 after
2546 2550
2547 ExtensionService::NaClModuleInfoList::iterator 2551 ExtensionService::NaClModuleInfoList::iterator
2548 ExtensionService::FindNaClModule(const GURL& url) { 2552 ExtensionService::FindNaClModule(const GURL& url) {
2549 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); 2553 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
2550 iter != nacl_module_list_.end(); ++iter) { 2554 iter != nacl_module_list_.end(); ++iter) {
2551 if (iter->url == url) 2555 if (iter->url == url)
2552 return iter; 2556 return iter;
2553 } 2557 }
2554 return nacl_module_list_.end(); 2558 return nacl_module_list_.end();
2555 } 2559 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/common/chrome_notification_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698