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

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

Issue 11445038: Revert changes to have ExtensionService notify ThemeService directly for themes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error Created 8 years 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service.cc » ('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 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 const extensions::Extension* e, const char* histogram); 689 const extensions::Extension* e, const char* histogram);
690 690
691 // Open a dev tools window for the background page for the given extension, 691 // Open a dev tools window for the background page for the given extension,
692 // starting the background page first if necesary. 692 // starting the background page first if necesary.
693 void InspectBackgroundPage(const extensions::Extension* extension); 693 void InspectBackgroundPage(const extensions::Extension* extension);
694 694
695 #if defined(UNIT_TEST) 695 #if defined(UNIT_TEST)
696 void TrackTerminatedExtensionForTest(const extensions::Extension* extension) { 696 void TrackTerminatedExtensionForTest(const extensions::Extension* extension) {
697 TrackTerminatedExtension(extension); 697 TrackTerminatedExtension(extension);
698 } 698 }
699
700 void FinishInstallationForTest(const extensions::Extension* extension) {
701 FinishInstallation(extension);
702 }
703 #endif 699 #endif
704 700
705 extensions::AppShortcutManager* app_shortcut_manager() { 701 extensions::AppShortcutManager* app_shortcut_manager() {
706 return &app_shortcut_manager_; 702 return &app_shortcut_manager_;
707 } 703 }
708 704
709 // Specialization of syncer::SyncableService::AsWeakPtr. 705 // Specialization of syncer::SyncableService::AsWeakPtr.
710 base::WeakPtr<ExtensionService> AsWeakPtr() { return base::AsWeakPtr(this); } 706 base::WeakPtr<ExtensionService> AsWeakPtr() { return base::AsWeakPtr(this); }
711 707
712 bool browser_terminating() const { return browser_terminating_; } 708 bool browser_terminating() const { return browser_terminating_; }
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 #endif 1028 #endif
1033 1029
1034 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 1030 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
1035 InstallAppsWithUnlimtedStorage); 1031 InstallAppsWithUnlimtedStorage);
1036 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 1032 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
1037 InstallAppsAndCheckStorageProtection); 1033 InstallAppsAndCheckStorageProtection);
1038 DISALLOW_COPY_AND_ASSIGN(ExtensionService); 1034 DISALLOW_COPY_AND_ASSIGN(ExtensionService);
1039 }; 1035 };
1040 1036
1041 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 1037 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698