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

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

Issue 7067032: Add MenuModelAdapter to wrap ui::MenuModel with views::MenuDelegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore NOTREACHED() in IsCommandEnabled(). Created 9 years, 7 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) 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/string_number_conversions.h" 5 #include "base/string_number_conversions.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/automation/ui_controls.h" 8 #include "chrome/browser/automation/ui_controls.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/bookmarks/bookmark_utils.h" 10 #include "chrome/browser/bookmarks/bookmark_utils.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 virtual HICON GetDefaultWindowIcon() const { return 0; } 94 virtual HICON GetDefaultWindowIcon() const { return 0; }
95 #endif 95 #endif
96 96
97 virtual void AddRef() { 97 virtual void AddRef() {
98 } 98 }
99 99
100 virtual void ReleaseRef() { 100 virtual void ReleaseRef() {
101 MessageLoopForUI::current()->Quit(); 101 MessageLoopForUI::current()->Quit();
102 } 102 }
103 103
104 virtual int GetDispositionForEvent(int event_flags) OVERRIDE {
105 return 0;
106 }
107
104 private: 108 private:
105 DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl); 109 DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl);
106 }; 110 };
107 111
108 // PageNavigator implementation that records the URL. 112 // PageNavigator implementation that records the URL.
109 class TestingPageNavigator : public PageNavigator { 113 class TestingPageNavigator : public PageNavigator {
110 public: 114 public:
111 virtual void OpenURL(const GURL& url, const GURL& referrer, 115 virtual void OpenURL(const GURL& url, const GURL& referrer,
112 WindowOpenDisposition disposition, 116 WindowOpenDisposition disposition,
113 PageTransition::Type transition) { 117 PageTransition::Type transition) {
(...skipping 1322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 1440
1437 bb_view_->GetMenu()->GetMenuController()->CancelAll(); 1441 bb_view_->GetMenu()->GetMenuController()->CancelAll();
1438 1442
1439 Done(); 1443 Done();
1440 } 1444 }
1441 1445
1442 ContextMenuNotificationObserver observer_; 1446 ContextMenuNotificationObserver observer_;
1443 }; 1447 };
1444 1448
1445 VIEW_TEST(BookmarkBarViewTest17, ContextMenus3) 1449 VIEW_TEST(BookmarkBarViewTest17, ContextMenus3)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698