| 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/shell/window_watcher_shelf_item_delegate.h" | 5 #include "ash/shell/window_watcher_shelf_item_delegate.h" |
| 6 | 6 |
| 7 #include "ash/shell/window_watcher.h" | 7 #include "ash/shell/window_watcher.h" |
| 8 #include "ash/wm/window_util.h" | 8 #include "ash/wm/window_util.h" |
| 9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
| 10 | 10 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 wm::ActivateWindow(window); | 33 wm::ActivateWindow(window); |
| 34 return SHELF_ACTION_WINDOW_ACTIVATED; | 34 return SHELF_ACTION_WINDOW_ACTIVATED; |
| 35 } | 35 } |
| 36 | 36 |
| 37 ShelfAppMenuItemList WindowWatcherShelfItemDelegate::GetAppMenuItems( | 37 ShelfAppMenuItemList WindowWatcherShelfItemDelegate::GetAppMenuItems( |
| 38 int event_flags) { | 38 int event_flags) { |
| 39 // Return an empty item list to avoid showing an application menu. | 39 // Return an empty item list to avoid showing an application menu. |
| 40 return ShelfAppMenuItemList(); | 40 return ShelfAppMenuItemList(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 void WindowWatcherShelfItemDelegate::ExecuteCommand(uint32_t command_id, |
| 44 int event_flags) { |
| 45 // This delegate does not support showing an application menu. |
| 46 NOTIMPLEMENTED(); |
| 47 } |
| 48 |
| 43 void WindowWatcherShelfItemDelegate::Close() {} | 49 void WindowWatcherShelfItemDelegate::Close() {} |
| 44 | 50 |
| 45 } // namespace shell | 51 } // namespace shell |
| 46 } // namespace ash | 52 } // namespace ash |
| OLD | NEW |