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/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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 } | 113 } |
114 | 114 |
115 virtual void ReleaseRef() OVERRIDE { | 115 virtual void ReleaseRef() OVERRIDE { |
116 MessageLoopForUI::current()->Quit(); | 116 MessageLoopForUI::current()->Quit(); |
117 } | 117 } |
118 | 118 |
119 virtual int GetDispositionForEvent(int event_flags) OVERRIDE { | 119 virtual int GetDispositionForEvent(int event_flags) OVERRIDE { |
120 return 0; | 120 return 0; |
121 } | 121 } |
122 | 122 |
| 123 #if defined(USE_AURA) |
| 124 virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper( |
| 125 views::NativeWidgetAura* native_widget) OVERRIDE { |
| 126 return NULL; |
| 127 } |
| 128 #endif |
| 129 |
123 private: | 130 private: |
124 DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl); | 131 DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl); |
125 }; | 132 }; |
126 | 133 |
127 // PageNavigator implementation that records the URL. | 134 // PageNavigator implementation that records the URL. |
128 class TestingPageNavigator : public PageNavigator { | 135 class TestingPageNavigator : public PageNavigator { |
129 public: | 136 public: |
130 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE { | 137 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE { |
131 url_ = params.url; | 138 url_ = params.url; |
132 return NULL; | 139 return NULL; |
(...skipping 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1584 ASSERT_TRUE(menu != NULL); | 1591 ASSERT_TRUE(menu != NULL); |
1585 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); | 1592 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); |
1586 | 1593 |
1587 menu->GetMenuController()->CancelAll(); | 1594 menu->GetMenuController()->CancelAll(); |
1588 | 1595 |
1589 Done(); | 1596 Done(); |
1590 } | 1597 } |
1591 }; | 1598 }; |
1592 | 1599 |
1593 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) | 1600 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) |
OLD | NEW |