summaryrefslogtreecommitdiff
path: root/chromium/ui/app_list/search_result.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ui/app_list/search_result.h')
-rw-r--r--chromium/ui/app_list/search_result.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/ui/app_list/search_result.h b/chromium/ui/app_list/search_result.h
index 5baa50f5579..e8e265fa70b 100644
--- a/chromium/ui/app_list/search_result.h
+++ b/chromium/ui/app_list/search_result.h
@@ -12,8 +12,8 @@
#include "base/strings/string16.h"
#include "ui/app_list/app_list_export.h"
#include "ui/base/models/list_model.h"
-#include "ui/base/range/range.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/range/range.h"
namespace ui {
class MenuModel;
@@ -45,7 +45,7 @@ class APP_LIST_EXPORT SearchResult {
}
int styles;
- ui::Range range;
+ gfx::Range range;
};
typedef std::vector<Tag> Tags;
@@ -106,7 +106,8 @@ class APP_LIST_EXPORT SearchResult {
void AddObserver(SearchResultObserver* observer);
void RemoveObserver(SearchResultObserver* observer);
- // Returns the context menu model for this item.
+ // Returns the context menu model for this item, or NULL if there is currently
+ // no menu for the item (e.g. during install).
// Note the returned menu model is owned by this item.
virtual ui::MenuModel* GetContextMenuModel();