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

Unified Diff: chrome/browser/ui/app_list/search/app_result.h

Issue 621823004: Simplifies the structure of app_list search a bit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/main/url_search_provider.cc ('k') | chrome/browser/ui/app_list/search/app_result.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c92b2dc87757e8ca62b7805cd1743083373ec111..dcbe8ed79a9b71b8bfe466cde2ab493c63be5946 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();
« no previous file with comments | « athena/main/url_search_provider.cc ('k') | chrome/browser/ui/app_list/search/app_result.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698