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

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: Created 6 years, 3 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
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..c7ba25158c853827d90bd5306f7a27d608b8f78b 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,11 @@ class AppResult : public ChromeSearchResult,
void UpdateFromLastLaunched(const base::Time& current_time,
const base::Time& last_launched);
- // ChromeSearchResult overides:
+ // SearchResult overides:
tapted 2014/10/02 07:19:21 nit (while you're here) overides -> overrides. Or
Jun Mukai 2014/10/03 01:24:23 Done.
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;
+ virtual SearchResultType GetType() OVERRIDE;
private:
void StartObservingExtensionRegistry();

Powered by Google App Engine
This is Rietveld 408576698