Refactor LauncherDelegate

ash/launcher/launcher.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 "ash/launcher/launcher.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/focus_cycler.h"
 #include "ash/launcher/launcher_delegate.h"
+#include "ash/launcher/launcher_item_delegate.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_navigator.h"
 #include "ash/launcher/launcher_view.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 79 matching lines @@
 void Launcher::ActivateLauncherItem(int index) {
   // We pass in a keyboard event which will then trigger a switch to the
   // next item if the current one is already active.
   ui::KeyEvent event(ui::ET_KEY_RELEASED,
                      ui::VKEY_UNKNOWN,  // The actual key gets ignored.
                      ui::EF_NONE,
                      false);
 
   const ash::LauncherItems& items =
       launcher_view_->model()->items();
-  delegate_->ItemSelected(items[index], event);
+  LauncherItemDelegate* item_delegate =

[sky, 2013/08/23 20:23:14]

Do we ever have a NULL delegate?

[simonhong_, 2013/08/26 08:47:10]

item_delegate is always not NULL.

+      delegate_->GetLauncherItemDelegate(items[index]);
+  if (item_delegate)
+    item_delegate->ItemSelected(items[index], event);
 }
 
 void Launcher::CycleWindowLinear(CycleDirection direction) {
   int item_index = GetNextActivatedItemIndex(
       *(launcher_view_->model()), direction);
   if (item_index >= 0)
     ActivateLauncherItem(item_index);
 }
 
 void Launcher::AddIconObserver(LauncherIconObserver* observer) {
@@ skipping 63 matching lines @@
 
 gfx::Rect Launcher::GetLauncherViewBounds() const {
   return launcher_view_->bounds();
 }
 
 app_list::ApplicationDragAndDropHost* Launcher::GetDragAndDropHostForAppList() {
   return launcher_view_;
 }
 
 }  // namespace ash