| 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/test/test_shelf_item_delegate.h" | 5 #include "ash/common/test/test_shelf_item_delegate.h" |
| 6 | 6 |
| 7 #include "ash/common/wm_window.h" | 7 #include "ash/common/wm_window.h" |
| 8 #include "ash/wm/window_util.h" | 8 #include "ash/wm/window_util.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 return SHELF_ACTION_WINDOW_ACTIVATED; | 27 return SHELF_ACTION_WINDOW_ACTIVATED; |
| 28 } | 28 } |
| 29 return SHELF_ACTION_NONE; | 29 return SHELF_ACTION_NONE; |
| 30 } | 30 } |
| 31 | 31 |
| 32 ShelfAppMenuItemList TestShelfItemDelegate::GetAppMenuItems(int event_flags) { | 32 ShelfAppMenuItemList TestShelfItemDelegate::GetAppMenuItems(int event_flags) { |
| 33 // Return an empty item list to avoid showing an application menu. | 33 // Return an empty item list to avoid showing an application menu. |
| 34 return ShelfAppMenuItemList(); | 34 return ShelfAppMenuItemList(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 void TestShelfItemDelegate::ExecuteCommand(uint32_t command_id, |
| 38 int event_flags) { |
| 39 // This delegate does not support showing an application menu. |
| 40 NOTIMPLEMENTED(); |
| 41 } |
| 42 |
| 37 void TestShelfItemDelegate::Close() {} | 43 void TestShelfItemDelegate::Close() {} |
| 38 | 44 |
| 39 } // namespace test | 45 } // namespace test |
| 40 } // namespace ash | 46 } // namespace ash |
| OLD | NEW |