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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 return CanUserModifyShelfAutoHideBehavior(controller_->profile()); | 102 return CanUserModifyShelfAutoHideBehavior(controller_->profile()); |
103 default: | 103 default: |
104 DCHECK(command_id < MENU_ITEM_COUNT); | 104 DCHECK(command_id < MENU_ITEM_COUNT); |
105 return true; | 105 return true; |
106 } | 106 } |
107 } | 107 } |
108 | 108 |
109 void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) { | 109 void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) { |
110 switch (static_cast<MenuItem>(command_id)) { | 110 switch (static_cast<MenuItem>(command_id)) { |
111 case MENU_OPEN_NEW: | 111 case MENU_OPEN_NEW: |
112 controller_->Launch(item_.id, ui::EF_NONE); | 112 controller_->LaunchApp( |
| 113 item_.id, ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE, |
| 114 ash::WmWindow::GetAuraWindow(wm_shelf_->GetWindow()) |
| 115 ->GetRootWindow()); |
113 break; | 116 break; |
114 case MENU_CLOSE: | 117 case MENU_CLOSE: |
115 if (item_.type == ash::TYPE_DIALOG) { | 118 if (item_.type == ash::TYPE_DIALOG) { |
116 ash::ShelfItemDelegate* item_delegate = | 119 ash::ShelfItemDelegate* item_delegate = |
117 controller_->shelf_model()->GetShelfItemDelegate(item_.id); | 120 controller_->shelf_model()->GetShelfItemDelegate(item_.id); |
118 DCHECK(item_delegate); | 121 DCHECK(item_delegate); |
119 item_delegate->Close(); | 122 item_delegate->Close(); |
120 } else { | 123 } else { |
121 // TODO(simonhong): Use ShelfItemDelegate::Close(). | 124 // TODO(simonhong): Use ShelfItemDelegate::Close(). |
122 controller_->Close(item_.id); | 125 controller_->Close(item_.id); |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 case MENU_PIN: | 201 case MENU_PIN: |
199 case MENU_AUTO_HIDE: | 202 case MENU_AUTO_HIDE: |
200 case MENU_ALIGNMENT_MENU: | 203 case MENU_ALIGNMENT_MENU: |
201 case MENU_CHANGE_WALLPAPER: | 204 case MENU_CHANGE_WALLPAPER: |
202 LauncherContextMenu::ExecuteCommand(command_id, event_flags); | 205 LauncherContextMenu::ExecuteCommand(command_id, event_flags); |
203 return true; | 206 return true; |
204 default: | 207 default: |
205 return false; | 208 return false; |
206 } | 209 } |
207 } | 210 } |
OLD | NEW |