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 "chrome/browser/automation/ui_controls.h" | 5 #include "chrome/browser/automation/ui_controls.h" |
6 #include "chrome/test/base/view_event_test_base.h" | 6 #include "chrome/test/base/view_event_test_base.h" |
7 #include "ui/base/models/menu_model.h" | 7 #include "ui/base/models/menu_model.h" |
8 #include "views/controls/button/menu_button.h" | 8 #include "views/controls/button/menu_button.h" |
9 #include "views/controls/menu/menu_controller.h" | 9 #include "views/controls/menu/menu_controller.h" |
10 #include "views/controls/menu/menu_item_view.h" | 10 #include "views/controls/menu/menu_item_view.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 } | 37 } |
38 | 38 |
39 virtual views::View* GetDefaultParentView() OVERRIDE | 39 virtual views::View* GetDefaultParentView() OVERRIDE |
40 { | 40 { |
41 return NULL; | 41 return NULL; |
42 } | 42 } |
43 | 43 |
44 virtual void SaveWindowPlacement(const views::Widget* widget, | 44 virtual void SaveWindowPlacement(const views::Widget* widget, |
45 const std::wstring& window_name, | 45 const std::wstring& window_name, |
46 const gfx::Rect& bounds, | 46 const gfx::Rect& bounds, |
47 bool maximized) OVERRIDE { | 47 ui::WindowShowState show_state) OVERRIDE { |
48 } | 48 } |
49 | 49 |
50 virtual bool GetSavedWindowBounds(const std::wstring& window_name, | 50 virtual bool GetSavedWindowPlacement( |
51 gfx::Rect* bounds) const OVERRIDE { | 51 const std::wstring& window_name, |
| 52 gfx::Rect* bounds, |
| 53 ui::WindowShowState* show_state) const OVERRIDE { |
52 return false; | 54 return false; |
53 } | 55 } |
54 | 56 |
55 virtual bool GetSavedMaximizedState(const std::wstring& window_name, | |
56 bool* maximized) const OVERRIDE { | |
57 return false; | |
58 } | |
59 | |
60 virtual void NotifyAccessibilityEvent( | 57 virtual void NotifyAccessibilityEvent( |
61 views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE { | 58 views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE { |
62 } | 59 } |
63 | 60 |
64 virtual void NotifyMenuItemFocused( | 61 virtual void NotifyMenuItemFocused( |
65 const std::wstring& menu_name, | 62 const std::wstring& menu_name, |
66 const std::wstring& menu_item_name, | 63 const std::wstring& menu_item_name, |
67 int item_index, | 64 int item_index, |
68 int item_count, | 65 int item_count, |
69 bool has_submenu) OVERRIDE { | 66 bool has_submenu) OVERRIDE { |
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 TestViewsDelegate views_delegate_; | 364 TestViewsDelegate views_delegate_; |
368 | 365 |
369 views::MenuButton* button_; | 366 views::MenuButton* button_; |
370 TopMenuModel top_menu_model_; | 367 TopMenuModel top_menu_model_; |
371 views::MenuModelAdapter menu_model_adapter_; | 368 views::MenuModelAdapter menu_model_adapter_; |
372 views::MenuItemView* menu_; | 369 views::MenuItemView* menu_; |
373 scoped_ptr<views::MenuRunner> menu_runner_; | 370 scoped_ptr<views::MenuRunner> menu_runner_; |
374 }; | 371 }; |
375 | 372 |
376 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) | 373 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) |
OLD | NEW |