| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "base/callback.h" | 5 #include "base/callback.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/test/base/ui_test_utils.h" | 7 #include "chrome/test/base/ui_test_utils.h" |
| 8 #include "chrome/test/base/view_event_test_base.h" | 8 #include "chrome/test/base/view_event_test_base.h" |
| 9 #include "ui/base/models/menu_model.h" | 9 #include "ui/base/models/menu_model.h" |
| 10 #include "ui/ui_controls/ui_controls.h" | 10 #include "ui/ui_controls/ui_controls.h" |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 | 128 |
| 129 virtual bool IsItemDynamicAt(int index) const OVERRIDE { | 129 virtual bool IsItemDynamicAt(int index) const OVERRIDE { |
| 130 return false; | 130 return false; |
| 131 } | 131 } |
| 132 | 132 |
| 133 virtual bool GetAcceleratorAt(int index, | 133 virtual bool GetAcceleratorAt(int index, |
| 134 ui::Accelerator* accelerator) const OVERRIDE { | 134 ui::Accelerator* accelerator) const OVERRIDE { |
| 135 return false; | 135 return false; |
| 136 } | 136 } |
| 137 | 137 |
| 138 virtual ui::MenuSeparatorType GetSeparatorTypeAt(int index) const OVERRIDE { |
| 139 return ui::NORMAL_SEPARATOR; |
| 140 } |
| 141 |
| 138 virtual bool IsItemCheckedAt(int index) const OVERRIDE { | 142 virtual bool IsItemCheckedAt(int index) const OVERRIDE { |
| 139 return false; | 143 return false; |
| 140 } | 144 } |
| 141 | 145 |
| 142 virtual int GetGroupIdAt(int index) const OVERRIDE { | 146 virtual int GetGroupIdAt(int index) const OVERRIDE { |
| 143 return 0; | 147 return 0; |
| 144 } | 148 } |
| 145 | 149 |
| 146 virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE { | 150 virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE { |
| 147 return false; | 151 return false; |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 views::MenuItemView* menu_; | 392 views::MenuItemView* menu_; |
| 389 scoped_ptr<views::MenuRunner> menu_runner_; | 393 scoped_ptr<views::MenuRunner> menu_runner_; |
| 390 }; | 394 }; |
| 391 | 395 |
| 392 #if defined(OS_WIN) | 396 #if defined(OS_WIN) |
| 393 #define MAYBE_RebuildMenu DISABLED_RebuildMenu | 397 #define MAYBE_RebuildMenu DISABLED_RebuildMenu |
| 394 #else | 398 #else |
| 395 #define MAYBE_RebuildMenu RebuildMenu | 399 #define MAYBE_RebuildMenu RebuildMenu |
| 396 #endif | 400 #endif |
| 397 VIEW_TEST(MenuModelAdapterTest, MAYBE_RebuildMenu) | 401 VIEW_TEST(MenuModelAdapterTest, MAYBE_RebuildMenu) |
| OLD | NEW |