Simplifies the structure of app_list search a bit.

ui/app_list/search_result.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_APP_LIST_SEARCH_RESULT_H_
 #define UI_APP_LIST_SEARCH_RESULT_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "ui/app_list/app_list_export.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/range/range.h"
 
 namespace ui {
 class MenuModel;
 }
 
 namespace app_list {
 
 class SearchResultObserver;
 
+// The type of the search result. This is used for logging so do not change the
+// order of this enum.
+enum SearchResultType {

[xiyuan, 2014/10/02 20:47:08]

This is chrome specific and probably should not live under ui. However, it seems
to be only used for UMA at the moment and we might be able to remove it by
tracking which provider generates the result. So, maybe add a TODO to get rid of
it?

[Jun Mukai, 2014/10/03 01:24:23]

Thinking about this, I think it's better not to do this, and your approach
(recording histogram on each of search result object) would be preferable.  This
approach, I will have to edit all of testing / mocky search result subclasses
and once when this enum moves back, I will have to remove them, which doesn't
look great.

[tapted, 2014/10/03 02:59:17]

looks nice :)

+  // A result that forwards an omnibox search result.
+  OMNIBOX_SEARCH_RESULT,
+  // An app result.
+  APP_SEARCH_RESULT,
+  // A search result from the webstore.
+  WEBSTORE_SEARCH_RESULT,
+  // A result that opens a webstore search.
+  SEARCH_WEBSTORE_SEARCH_RESULT,
+  // A result that opens a people search.
+  SEARCH_PEOPLE_SEARCH_RESULT,
+  SEARCH_RESULT_TYPE_BOUNDARY
+};
+
 // SearchResult consists of an icon, title text and details text. Title and
 // details text can have tagged ranges that are displayed differently from
 // default style.
 class APP_LIST_EXPORT SearchResult {
  public:
   // How the result should be displayed.
   enum DisplayType {
     DISPLAY_LIST,
     DISPLAY_TILE,
   };
@@ skipping 76 matching lines @@
 
   // Returns the dimension at which this result's icon should be displayed.
   int GetPreferredIconDimension() const;
 
   void NotifyItemInstalled();
   void NotifyItemUninstalled();
 
   void AddObserver(SearchResultObserver* observer);
   void RemoveObserver(SearchResultObserver* observer);
 
+  // TODO(mukai): Remove this method and really simplify the ownership of
+  // SearchResult. Ideally, SearchResult will be copyable.
+  virtual scoped_ptr<SearchResult> Duplicate();

[tapted, 2014/10/02 07:19:21]

Can these be pure virtual? I think I'd prefer the tests versions the only places
that do NOTREACHED.

[Jun Mukai, 2014/10/03 01:24:23]

Done.

+
+  // Returns the type of the search for logging. By default it returns
+  // SEARCH_RESULT_TYPE_BOUNDARY which is okay for tests but will cause problems
+  // in production.
+  virtual SearchResultType GetType();
+
   // Opens the result.
   virtual void Open(int event_flags);
 
-  // Invokes a custom action on the result.
+  // Invokes a custom action on the result. It does nothing by default.
   virtual void InvokeAction(int action_index, int event_flags);
 
   // 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();
 
  protected:
   void set_id(const std::string& id) { id_ = id; }
   void set_relevance(double relevance) { relevance_ = relevance; }
@@ skipping 20 matching lines @@
   int percent_downloaded_;
 
   ObserverList<SearchResultObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchResult);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_SEARCH_RESULT_H_