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

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

Issue 10664037: Moved ExtensionMenuManager and ExtensionMenuItem into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merged with latest master Created 8 years, 5 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
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/extensions/menu_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 10 matching lines...) Expand all
21 #include "base/memory/weak_ptr.h" 21 #include "base/memory/weak_ptr.h"
22 #include "base/property_bag.h" 22 #include "base/property_bag.h"
23 #include "base/string16.h" 23 #include "base/string16.h"
24 #include "base/time.h" 24 #include "base/time.h"
25 #include "base/tuple.h" 25 #include "base/tuple.h"
26 #include "chrome/browser/extensions/api/api_resource_controller.h" 26 #include "chrome/browser/extensions/api/api_resource_controller.h"
27 #include "chrome/browser/extensions/app_shortcut_manager.h" 27 #include "chrome/browser/extensions/app_shortcut_manager.h"
28 #include "chrome/browser/extensions/app_sync_bundle.h" 28 #include "chrome/browser/extensions/app_sync_bundle.h"
29 #include "chrome/browser/extensions/apps_promo.h" 29 #include "chrome/browser/extensions/apps_promo.h"
30 #include "chrome/browser/extensions/extension_icon_manager.h" 30 #include "chrome/browser/extensions/extension_icon_manager.h"
31 #include "chrome/browser/extensions/extension_menu_manager.h"
32 #include "chrome/browser/extensions/extension_prefs.h" 31 #include "chrome/browser/extensions/extension_prefs.h"
33 #include "chrome/browser/extensions/extension_process_manager.h" 32 #include "chrome/browser/extensions/extension_process_manager.h"
34 #include "chrome/browser/extensions/extension_sync_bundle.h" 33 #include "chrome/browser/extensions/extension_sync_bundle.h"
35 #include "chrome/browser/extensions/extension_toolbar_model.h" 34 #include "chrome/browser/extensions/extension_toolbar_model.h"
36 #include "chrome/browser/extensions/extension_warning_set.h" 35 #include "chrome/browser/extensions/extension_warning_set.h"
37 #include "chrome/browser/extensions/extensions_quota_service.h" 36 #include "chrome/browser/extensions/extensions_quota_service.h"
38 #include "chrome/browser/extensions/external_extension_provider_interface.h" 37 #include "chrome/browser/extensions/external_extension_provider_interface.h"
38 #include "chrome/browser/extensions/menu_manager.h"
39 #include "chrome/browser/extensions/pending_extension_manager.h" 39 #include "chrome/browser/extensions/pending_extension_manager.h"
40 #include "chrome/browser/extensions/process_map.h" 40 #include "chrome/browser/extensions/process_map.h"
41 #include "chrome/browser/prefs/pref_change_registrar.h" 41 #include "chrome/browser/prefs/pref_change_registrar.h"
42 #include "chrome/common/extensions/extension.h" 42 #include "chrome/common/extensions/extension.h"
43 #include "chrome/common/extensions/extension_constants.h" 43 #include "chrome/common/extensions/extension_constants.h"
44 #include "chrome/common/extensions/extension_set.h" 44 #include "chrome/common/extensions/extension_set.h"
45 #include "content/public/browser/browser_thread.h" 45 #include "content/public/browser/browser_thread.h"
46 #include "content/public/browser/notification_observer.h" 46 #include "content/public/browser/notification_observer.h"
47 #include "content/public/browser/notification_registrar.h" 47 #include "content/public/browser/notification_registrar.h"
48 #include "sync/api/sync_change.h" 48 #include "sync/api/sync_change.h"
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 return component_loader_.get(); 486 return component_loader_.get();
487 } 487 }
488 488
489 // Note that this may return NULL if autoupdate is not turned on. 489 // Note that this may return NULL if autoupdate is not turned on.
490 extensions::ExtensionUpdater* updater(); 490 extensions::ExtensionUpdater* updater();
491 491
492 ExtensionToolbarModel* toolbar_model() { return &toolbar_model_; } 492 ExtensionToolbarModel* toolbar_model() { return &toolbar_model_; }
493 493
494 ExtensionsQuotaService* quota_service() { return &quota_service_; } 494 ExtensionsQuotaService* quota_service() { return &quota_service_; }
495 495
496 ExtensionMenuManager* menu_manager() { return &menu_manager_; } 496 extensions::MenuManager* menu_manager() { return &menu_manager_; }
497 497
498 AppNotificationManager* app_notification_manager() { 498 AppNotificationManager* app_notification_manager() {
499 return app_notification_manager_.get(); 499 return app_notification_manager_.get();
500 } 500 }
501 501
502 ExtensionBrowserEventRouter* browser_event_router() { 502 ExtensionBrowserEventRouter* browser_event_router() {
503 return browser_event_router_.get(); 503 return browser_event_router_.get();
504 } 504 }
505 505
506 #if defined(OS_CHROMEOS) 506 #if defined(OS_CHROMEOS)
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 typedef std::map<std::string, int> OrphanedDevTools; 777 typedef std::map<std::string, int> OrphanedDevTools;
778 OrphanedDevTools orphaned_dev_tools_; 778 OrphanedDevTools orphaned_dev_tools_;
779 779
780 content::NotificationRegistrar registrar_; 780 content::NotificationRegistrar registrar_;
781 PrefChangeRegistrar pref_change_registrar_; 781 PrefChangeRegistrar pref_change_registrar_;
782 782
783 // Keeps track of loading and unloading component extensions. 783 // Keeps track of loading and unloading component extensions.
784 scoped_ptr<extensions::ComponentLoader> component_loader_; 784 scoped_ptr<extensions::ComponentLoader> component_loader_;
785 785
786 // Keeps track of menu items added by extensions. 786 // Keeps track of menu items added by extensions.
787 ExtensionMenuManager menu_manager_; 787 extensions::MenuManager menu_manager_;
788 788
789 // Keeps track of app notifications. 789 // Keeps track of app notifications.
790 scoped_refptr<AppNotificationManager> app_notification_manager_; 790 scoped_refptr<AppNotificationManager> app_notification_manager_;
791 791
792 // Keeps track of favicon-sized omnibox icons for extensions. 792 // Keeps track of favicon-sized omnibox icons for extensions.
793 ExtensionIconManager omnibox_icon_manager_; 793 ExtensionIconManager omnibox_icon_manager_;
794 ExtensionIconManager omnibox_popup_icon_manager_; 794 ExtensionIconManager omnibox_popup_icon_manager_;
795 795
796 // Manages the promotion of the web store. 796 // Manages the promotion of the web store.
797 AppsPromo apps_promo_; 797 AppsPromo apps_promo_;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 scoped_ptr<ExtensionGlobalError> extension_global_error_; 852 scoped_ptr<ExtensionGlobalError> extension_global_error_;
853 853
854 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 854 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
855 InstallAppsWithUnlimtedStorage); 855 InstallAppsWithUnlimtedStorage);
856 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 856 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
857 InstallAppsAndCheckStorageProtection); 857 InstallAppsAndCheckStorageProtection);
858 DISALLOW_COPY_AND_ASSIGN(ExtensionService); 858 DISALLOW_COPY_AND_ASSIGN(ExtensionService);
859 }; 859 };
860 860
861 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 861 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/extensions/menu_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698