| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ash/common/shelf/shelf_window_watcher_item_delegate.h" | 5 #include "ash/common/shelf/shelf_window_watcher_item_delegate.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf_controller.h" | 7 #include "ash/common/shelf/shelf_controller.h" |
| 8 #include "ash/common/shelf/shelf_model.h" | 8 #include "ash/common/shelf/shelf_model.h" |
| 9 #include "ash/common/wm/window_state.h" | 9 #include "ash/common/wm/window_state.h" |
| 10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 window_->Activate(); | 58 window_->Activate(); |
| 59 return SHELF_ACTION_WINDOW_ACTIVATED; | 59 return SHELF_ACTION_WINDOW_ACTIVATED; |
| 60 } | 60 } |
| 61 | 61 |
| 62 ShelfAppMenuItemList ShelfWindowWatcherItemDelegate::GetAppMenuItems( | 62 ShelfAppMenuItemList ShelfWindowWatcherItemDelegate::GetAppMenuItems( |
| 63 int event_flags) { | 63 int event_flags) { |
| 64 // Return an empty item list to avoid showing an application menu. | 64 // Return an empty item list to avoid showing an application menu. |
| 65 return ShelfAppMenuItemList(); | 65 return ShelfAppMenuItemList(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void ShelfWindowWatcherItemDelegate::ExecuteCommand(uint32_t command_id, |
| 69 int event_flags) { |
| 70 // This delegate does not support showing an application menu. |
| 71 NOTIMPLEMENTED(); |
| 72 } |
| 73 |
| 68 void ShelfWindowWatcherItemDelegate::Close() { | 74 void ShelfWindowWatcherItemDelegate::Close() { |
| 69 window_->CloseWidget(); | 75 window_->CloseWidget(); |
| 70 } | 76 } |
| 71 | 77 |
| 72 } // namespace ash | 78 } // namespace ash |
| OLD | NEW |