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/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
6 #include "base/string_number_conversions.h" | 6 #include "base/string_number_conversions.h" |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
9 #include "chrome/browser/automation/ui_controls.h" | 9 #include "chrome/browser/automation/ui_controls.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 namespace { | 67 namespace { |
68 | 68 |
69 class ViewsDelegateImpl : public views::ViewsDelegate { | 69 class ViewsDelegateImpl : public views::ViewsDelegate { |
70 public: | 70 public: |
71 ViewsDelegateImpl() {} | 71 ViewsDelegateImpl() {} |
72 virtual ui::Clipboard* GetClipboard() const OVERRIDE { return NULL; } | 72 virtual ui::Clipboard* GetClipboard() const OVERRIDE { return NULL; } |
73 virtual views::View* GetDefaultParentView() OVERRIDE { return NULL; } | 73 virtual views::View* GetDefaultParentView() OVERRIDE { return NULL; } |
74 virtual void SaveWindowPlacement(const views::Widget* window, | 74 virtual void SaveWindowPlacement(const views::Widget* window, |
75 const std::wstring& window_name, | 75 const std::wstring& window_name, |
76 const gfx::Rect& bounds, | 76 const gfx::Rect& bounds, |
77 bool maximized) OVERRIDE {} | 77 ui::WindowShowState show_state) OVERRIDE {} |
78 virtual bool GetSavedWindowBounds(const std::wstring& window_name, | 78 virtual bool GetSavedWindowBounds(const std::wstring& window_name, |
79 gfx::Rect* bounds) const OVERRIDE { | 79 gfx::Rect* bounds) const OVERRIDE { |
80 return false; | 80 return false; |
81 } | 81 } |
82 virtual bool GetSavedMaximizedState(const std::wstring& window_name, | 82 virtual bool GetSavedWindowShowState( |
83 bool* maximized) const OVERRIDE { | 83 const std::wstring& window_name, |
| 84 ui::WindowShowState* show_state) const OVERRIDE { |
84 return false; | 85 return false; |
85 } | 86 } |
86 | 87 |
87 virtual void NotifyAccessibilityEvent( | 88 virtual void NotifyAccessibilityEvent( |
88 views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {} | 89 views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {} |
89 virtual void NotifyMenuItemFocused( | 90 virtual void NotifyMenuItemFocused( |
90 const std::wstring& menu_name, | 91 const std::wstring& menu_name, |
91 const std::wstring& menu_item_name, | 92 const std::wstring& menu_item_name, |
92 int item_index, | 93 int item_index, |
93 int item_count, | 94 int item_count, |
(...skipping 1482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1576 ASSERT_TRUE(menu != NULL); | 1577 ASSERT_TRUE(menu != NULL); |
1577 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); | 1578 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); |
1578 | 1579 |
1579 menu->GetMenuController()->CancelAll(); | 1580 menu->GetMenuController()->CancelAll(); |
1580 | 1581 |
1581 Done(); | 1582 Done(); |
1582 } | 1583 } |
1583 }; | 1584 }; |
1584 | 1585 |
1585 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) | 1586 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) |
OLD | NEW |