Elim ActivateAppListItem, ChromeAppListItem

ash/shell/app_list.cc

 // 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.
 
 #include <string>
 
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/toplevel_window.h"
@@ skipping 81 matching lines @@
     switch (type) {
       case WIDGETS_WINDOW:
         return "Creates a window to show example widgets";
       case EXAMPLES_WINDOW:
         return "Creates a window to show views example.";
       default:
         return std::string();
     }
   }
 
-  static void Activate(Type type, int event_flags) {
+  static void ActivateItem(Type type, int event_flags) {
      switch (type) {
       case TOPLEVEL_WINDOW: {
         ToplevelWindow::CreateParams params;
         params.can_resize = true;
         ToplevelWindow::CreateToplevelWindow(params);
         break;
       }
       case NON_RESIZABLE_WINDOW: {
         ToplevelWindow::CreateToplevelWindow(ToplevelWindow::CreateParams());
         break;
@@ skipping 10 matching lines @@
         views::examples::ShowExamplesWindowWithContent(
             views::examples::DO_NOTHING_ON_CLOSE,
             ash::Shell::GetInstance()->browser_context());
         break;
       }
       default:
         break;
     }
   }
 
-  void Activate(int event_flags) {
-    Activate(type_, event_flags);
+  // AppListItemModel
+  virtual void Activate(int event_flags) OVERRIDE {
+    ActivateItem(type_, event_flags);
   }
 
  private:
   Type type_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncherItem);
 };
 
 // ExampleSearchResult is an app list search result. It provides what icon to
 // show, what should title and details text look like. It also carries the
@@ skipping 88 matching lines @@
 
   virtual app_list::SigninDelegate* GetSigninDelegate() OVERRIDE {
     return NULL;
   }
 
   virtual void GetShortcutPathForApp(
       const std::string& app_id,
       const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE {
   }
 
-  virtual void ActivateAppListItem(app_list::AppListItemModel* item,
-                                   int event_flags) OVERRIDE {
-    static_cast<WindowTypeLauncherItem*>(item)->Activate(event_flags);
-  }
-
   virtual void OpenSearchResult(app_list::SearchResult* result,
                                 int event_flags) OVERRIDE {
     const ExampleSearchResult* example_result =
         static_cast<const ExampleSearchResult*>(result);
-    WindowTypeLauncherItem::Activate(example_result->type(), event_flags);
+    WindowTypeLauncherItem::ActivateItem(example_result->type(), event_flags);
   }
 
   virtual void InvokeSearchResultAction(app_list::SearchResult* result,
                                         int action_index,
                                         int event_flags) OVERRIDE {
     NOTIMPLEMENTED();
   }
 
   virtual void StartSearch() OVERRIDE {
     base::string16 query;
@@ skipping 60 matching lines @@
 };
 
 }  // namespace
 
 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
   return new ExampleAppListViewDelegate;
 }
 
 }  // namespace shell
 }  // namespace ash