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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 return 0; | 121 return 0; |
122 } | 122 } |
123 | 123 |
124 #if defined(USE_AURA) | 124 #if defined(USE_AURA) |
125 virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper( | 125 virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper( |
126 views::NativeWidgetAura* native_widget) OVERRIDE { | 126 views::NativeWidgetAura* native_widget) OVERRIDE { |
127 return NULL; | 127 return NULL; |
128 } | 128 } |
129 #endif | 129 #endif |
130 | 130 |
| 131 virtual content::WebContents* CreateWebContents( |
| 132 content::BrowserContext* browser_context, |
| 133 content::SiteInstance* site_instance) OVERRIDE { |
| 134 return NULL; |
| 135 } |
| 136 |
131 private: | 137 private: |
132 DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl); | 138 DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl); |
133 }; | 139 }; |
134 | 140 |
135 // PageNavigator implementation that records the URL. | 141 // PageNavigator implementation that records the URL. |
136 class TestingPageNavigator : public PageNavigator { | 142 class TestingPageNavigator : public PageNavigator { |
137 public: | 143 public: |
138 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE { | 144 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE { |
139 url_ = params.url; | 145 url_ = params.url; |
140 return NULL; | 146 return NULL; |
(...skipping 1456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1597 ASSERT_TRUE(menu != NULL); | 1603 ASSERT_TRUE(menu != NULL); |
1598 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); | 1604 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); |
1599 | 1605 |
1600 menu->GetMenuController()->CancelAll(); | 1606 menu->GetMenuController()->CancelAll(); |
1601 | 1607 |
1602 Done(); | 1608 Done(); |
1603 } | 1609 } |
1604 }; | 1610 }; |
1605 | 1611 |
1606 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) | 1612 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) |
OLD | NEW |