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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/callback.h" | 6 #include "base/callback.h" |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {} | 93 views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {} |
94 virtual void NotifyMenuItemFocused(const string16& menu_name, | 94 virtual void NotifyMenuItemFocused(const string16& menu_name, |
95 const string16& menu_item_name, | 95 const string16& menu_item_name, |
96 int item_index, | 96 int item_index, |
97 int item_count, | 97 int item_count, |
98 bool has_submenu) OVERRIDE {} | 98 bool has_submenu) OVERRIDE {} |
99 | 99 |
100 #if defined(OS_WIN) | 100 #if defined(OS_WIN) |
101 virtual HICON GetDefaultWindowIcon() const OVERRIDE { return 0; } | 101 virtual HICON GetDefaultWindowIcon() const OVERRIDE { return 0; } |
102 #endif | 102 #endif |
| 103 virtual views::NonClientFrameView* CreateDefaultNonClientFrameView( |
| 104 views::Widget* widget) OVERRIDE { |
| 105 return NULL; |
| 106 } |
103 | 107 |
104 virtual void AddRef() OVERRIDE { | 108 virtual void AddRef() OVERRIDE { |
105 } | 109 } |
106 | 110 |
107 virtual void ReleaseRef() OVERRIDE { | 111 virtual void ReleaseRef() OVERRIDE { |
108 MessageLoopForUI::current()->Quit(); | 112 MessageLoopForUI::current()->Quit(); |
109 } | 113 } |
110 | 114 |
111 virtual int GetDispositionForEvent(int event_flags) OVERRIDE { | 115 virtual int GetDispositionForEvent(int event_flags) OVERRIDE { |
112 return 0; | 116 return 0; |
(...skipping 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1568 ASSERT_TRUE(menu != NULL); | 1572 ASSERT_TRUE(menu != NULL); |
1569 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); | 1573 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); |
1570 | 1574 |
1571 menu->GetMenuController()->CancelAll(); | 1575 menu->GetMenuController()->CancelAll(); |
1572 | 1576 |
1573 Done(); | 1577 Done(); |
1574 } | 1578 } |
1575 }; | 1579 }; |
1576 | 1580 |
1577 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) | 1581 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) |
OLD | NEW |