Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(264)

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

Issue 10083057: Revert 132856 - Aura/ash split: Remove hacks and get chrome linking without ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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
130 private: 123 private:
131 DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl); 124 DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl);
132 }; 125 };
133 126
134 // PageNavigator implementation that records the URL. 127 // PageNavigator implementation that records the URL.
135 class TestingPageNavigator : public PageNavigator { 128 class TestingPageNavigator : public PageNavigator {
136 public: 129 public:
137 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE { 130 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE {
138 url_ = params.url; 131 url_ = params.url;
139 return NULL; 132 return NULL;
(...skipping 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1591 ASSERT_TRUE(menu != NULL); 1584 ASSERT_TRUE(menu != NULL);
1592 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); 1585 ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
1593 1586
1594 menu->GetMenuController()->CancelAll(); 1587 menu->GetMenuController()->CancelAll();
1595 1588
1596 Done(); 1589 Done();
1597 } 1590 }
1598 }; 1591 };
1599 1592
1600 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) 1593 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu)
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/color_chooser_aura.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698