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

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

Issue 10836163: Fix android build bustage caused by r150622. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« 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 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 850
851 // Contains an entry for each warning that shall be currently shown. 851 // Contains an entry for each warning that shall be currently shown.
852 ExtensionWarningSet extension_warnings_; 852 ExtensionWarningSet extension_warnings_;
853 853
854 extensions::ProcessMap process_map_; 854 extensions::ProcessMap process_map_;
855 855
856 AppShortcutManager app_shortcut_manager_; 856 AppShortcutManager app_shortcut_manager_;
857 857
858 scoped_ptr<ExtensionErrorUI> extension_error_ui_; 858 scoped_ptr<ExtensionErrorUI> extension_error_ui_;
859 859
860 #if defined(ENABLE_EXTENSIONS)
860 scoped_ptr<extensions::ExtensionActionStorageManager> 861 scoped_ptr<extensions::ExtensionActionStorageManager>
861 extension_action_storage_manager_; 862 extension_action_storage_manager_;
863 #endif
862 864
863 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 865 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
864 InstallAppsWithUnlimtedStorage); 866 InstallAppsWithUnlimtedStorage);
865 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 867 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
866 InstallAppsAndCheckStorageProtection); 868 InstallAppsAndCheckStorageProtection);
867 DISALLOW_COPY_AND_ASSIGN(ExtensionService); 869 DISALLOW_COPY_AND_ASSIGN(ExtensionService);
868 }; 870 };
869 871
870 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 872 #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