| Index: chrome/browser/ui/app_list/search/app_result.h
|
| diff --git a/chrome/browser/ui/app_list/search/app_result.h b/chrome/browser/ui/app_list/search/app_result.h
|
| index aebf662f31f3598b1b5ea4d58dfd47405f7bcb0d..41dcd15a95fb36cd368369a457fd240b3ee76c72 100644
|
| --- a/chrome/browser/ui/app_list/search/app_result.h
|
| +++ b/chrome/browser/ui/app_list/search/app_result.h
|
| @@ -9,10 +9,10 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/ui/app_list/app_context_menu_delegate.h"
|
| -#include "chrome/browser/ui/app_list/search/chrome_search_result.h"
|
| #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
|
| #include "extensions/browser/extension_icon_image.h"
|
| #include "extensions/browser/extension_registry_observer.h"
|
| +#include "ui/app_list/search_result.h"
|
|
|
| class AppListControllerDelegate;
|
| class ExtensionEnableFlow;
|
| @@ -32,7 +32,7 @@ class AppContextMenu;
|
| class TokenizedString;
|
| class TokenizedStringMatch;
|
|
|
| -class AppResult : public ChromeSearchResult,
|
| +class AppResult : public SearchResult,
|
| public extensions::IconImage::Observer,
|
| public AppContextMenuDelegate,
|
| public ExtensionEnableFlowDelegate,
|
| @@ -49,12 +49,10 @@ class AppResult : public ChromeSearchResult,
|
| void UpdateFromLastLaunched(const base::Time& current_time,
|
| const base::Time& last_launched);
|
|
|
| - // ChromeSearchResult overides:
|
| + // SearchResult overrides:
|
| virtual void Open(int event_flags) OVERRIDE;
|
| - virtual void InvokeAction(int action_index, int event_flags) OVERRIDE;
|
| - virtual scoped_ptr<ChromeSearchResult> Duplicate() OVERRIDE;
|
| + virtual scoped_ptr<SearchResult> Duplicate() OVERRIDE;
|
| virtual ui::MenuModel* GetContextMenuModel() OVERRIDE;
|
| - virtual ChromeSearchResultType GetType() OVERRIDE;
|
|
|
| private:
|
| void StartObservingExtensionRegistry();
|
|
|