| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" | 5 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "ash/shelf/shelf_model.h" | 9 #include "ash/shelf/shelf_model.h" |
| 10 #include "ash/shelf/wm_shelf.h" | 10 #include "ash/shelf/wm_shelf.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 } | 109 } |
| 110 | 110 |
| 111 void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) { | 111 void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) { |
| 112 switch (static_cast<MenuItem>(command_id)) { | 112 switch (static_cast<MenuItem>(command_id)) { |
| 113 case MENU_OPEN_NEW: | 113 case MENU_OPEN_NEW: |
| 114 controller_->Launch(item_.id, ui::EF_NONE); | 114 controller_->Launch(item_.id, ui::EF_NONE); |
| 115 break; | 115 break; |
| 116 case MENU_CLOSE: | 116 case MENU_CLOSE: |
| 117 if (item_.type == ash::TYPE_DIALOG) { | 117 if (item_.type == ash::TYPE_DIALOG) { |
| 118 ash::ShelfItemDelegate* item_delegate = | 118 ash::ShelfItemDelegate* item_delegate = |
| 119 ash::Shell::Get()->shelf_model()->GetShelfItemDelegate(item_.id); | 119 controller_->shelf_model()->GetShelfItemDelegate(item_.id); |
| 120 DCHECK(item_delegate); | 120 DCHECK(item_delegate); |
| 121 item_delegate->Close(); | 121 item_delegate->Close(); |
| 122 } else { | 122 } else { |
| 123 // TODO(simonhong): Use ShelfItemDelegate::Close(). | 123 // TODO(simonhong): Use ShelfItemDelegate::Close(). |
| 124 controller_->Close(item_.id); | 124 controller_->Close(item_.id); |
| 125 } | 125 } |
| 126 ash::ShellPort::Get()->RecordUserMetricsAction( | 126 ash::ShellPort::Get()->RecordUserMetricsAction( |
| 127 ash::UMA_CLOSE_THROUGH_CONTEXT_MENU); | 127 ash::UMA_CLOSE_THROUGH_CONTEXT_MENU); |
| 128 break; | 128 break; |
| 129 case MENU_PIN: | 129 case MENU_PIN: |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 case MENU_PIN: | 201 case MENU_PIN: |
| 202 case MENU_AUTO_HIDE: | 202 case MENU_AUTO_HIDE: |
| 203 case MENU_ALIGNMENT_MENU: | 203 case MENU_ALIGNMENT_MENU: |
| 204 case MENU_CHANGE_WALLPAPER: | 204 case MENU_CHANGE_WALLPAPER: |
| 205 LauncherContextMenu::ExecuteCommand(command_id, event_flags); | 205 LauncherContextMenu::ExecuteCommand(command_id, event_flags); |
| 206 return true; | 206 return true; |
| 207 default: | 207 default: |
| 208 return false; | 208 return false; |
| 209 } | 209 } |
| 210 } | 210 } |
| OLD | NEW |