OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser/automation/ui_controls.h" | 7 #include "chrome/browser/automation/ui_controls.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/views/controls/button/menu_button.h" | 10 #include "ui/views/controls/button/menu_button.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 int item_index, | 60 int item_index, |
61 int item_count, | 61 int item_count, |
62 bool has_submenu) OVERRIDE { | 62 bool has_submenu) OVERRIDE { |
63 } | 63 } |
64 | 64 |
65 #if defined(OS_WIN) | 65 #if defined(OS_WIN) |
66 virtual HICON GetDefaultWindowIcon() const OVERRIDE { | 66 virtual HICON GetDefaultWindowIcon() const OVERRIDE { |
67 return NULL; | 67 return NULL; |
68 } | 68 } |
69 #endif | 69 #endif |
| 70 virtual views::NonClientFrameView* CreateDefaultNonClientFrameView( |
| 71 views::Widget* widget) OVERRIDE { |
| 72 return NULL; |
| 73 } |
70 | 74 |
71 virtual void AddRef() OVERRIDE { | 75 virtual void AddRef() OVERRIDE { |
72 } | 76 } |
73 | 77 |
74 virtual void ReleaseRef() OVERRIDE { | 78 virtual void ReleaseRef() OVERRIDE { |
75 } | 79 } |
76 | 80 |
77 // Converts views::Event::flags to a WindowOpenDisposition. | 81 // Converts views::Event::flags to a WindowOpenDisposition. |
78 virtual int GetDispositionForEvent(int event_flags) OVERRIDE { | 82 virtual int GetDispositionForEvent(int event_flags) OVERRIDE { |
79 return 0; | 83 return 0; |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 TestViewsDelegate views_delegate_; | 364 TestViewsDelegate views_delegate_; |
361 | 365 |
362 views::MenuButton* button_; | 366 views::MenuButton* button_; |
363 TopMenuModel top_menu_model_; | 367 TopMenuModel top_menu_model_; |
364 views::MenuModelAdapter menu_model_adapter_; | 368 views::MenuModelAdapter menu_model_adapter_; |
365 views::MenuItemView* menu_; | 369 views::MenuItemView* menu_; |
366 scoped_ptr<views::MenuRunner> menu_runner_; | 370 scoped_ptr<views::MenuRunner> menu_runner_; |
367 }; | 371 }; |
368 | 372 |
369 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) | 373 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) |
OLD | NEW |