| Index: chrome/browser/extensions/extension_service.h
|
| diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
|
| index 448b62f1eb8ad62ebbddd8bd1e9b6d06e52aa65c..dd5b931097feab45a82190588f488fd5c91def89 100644
|
| --- a/chrome/browser/extensions/extension_service.h
|
| +++ b/chrome/browser/extensions/extension_service.h
|
| @@ -621,7 +621,9 @@ class ExtensionService
|
| return &extension_warnings_;
|
| }
|
|
|
| - AppShortcutManager* app_shortcut_manager() { return &app_shortcut_manager_; }
|
| + extensions::AppShortcutManager* app_shortcut_manager() {
|
| + return &app_shortcut_manager_;
|
| + }
|
|
|
| // Specialization of syncer::SyncableService::AsWeakPtr.
|
| base::WeakPtr<ExtensionService> AsWeakPtr() { return base::AsWeakPtr(this); }
|
| @@ -858,7 +860,7 @@ class ExtensionService
|
|
|
| extensions::ProcessMap process_map_;
|
|
|
| - AppShortcutManager app_shortcut_manager_;
|
| + extensions::AppShortcutManager app_shortcut_manager_;
|
|
|
| scoped_ptr<ExtensionErrorUI> extension_error_ui_;
|
|
|
|
|