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

Side by Side Diff: chrome/browser/ui/views/accessibility_event_router_views_unittest.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 <string> 5 #include <string>
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/extensions/extension_accessibility_api.h" 10 #include "chrome/browser/extensions/extension_accessibility_api.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 int item_count, 58 int item_count,
59 bool has_submenu) {} 59 bool has_submenu) {}
60 #if defined(OS_WIN) 60 #if defined(OS_WIN)
61 virtual HICON GetDefaultWindowIcon() const { 61 virtual HICON GetDefaultWindowIcon() const {
62 return NULL; 62 return NULL;
63 } 63 }
64 #endif 64 #endif
65 virtual void AddRef() {} 65 virtual void AddRef() {}
66 virtual void ReleaseRef() {} 66 virtual void ReleaseRef() {}
67 67
68 virtual int GetDispositionForEvent(int event_flags) OVERRIDE {
69 return 0;
70 }
71
68 DISALLOW_COPY_AND_ASSIGN(AccessibilityViewsDelegate); 72 DISALLOW_COPY_AND_ASSIGN(AccessibilityViewsDelegate);
69 }; 73 };
70 74
71 class AccessibilityWindowDelegate : public views::WindowDelegate { 75 class AccessibilityWindowDelegate : public views::WindowDelegate {
72 public: 76 public:
73 explicit AccessibilityWindowDelegate(views::View* contents) 77 explicit AccessibilityWindowDelegate(views::View* contents)
74 : contents_(contents) { } 78 : contents_(contents) { }
75 79
76 virtual void DeleteDelegate() { delete this; } 80 virtual void DeleteDelegate() { delete this; }
77 81
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 EXPECT_EQ(2, focus_event_count_); 182 EXPECT_EQ(2, focus_event_count_);
179 EXPECT_EQ(kButton3NewASCII, last_control_name_); 183 EXPECT_EQ(kButton3NewASCII, last_control_name_);
180 184
181 // Advance to button 1 and check the notification. 185 // Advance to button 1 and check the notification.
182 focus_manager->AdvanceFocus(false); 186 focus_manager->AdvanceFocus(false);
183 EXPECT_EQ(3, focus_event_count_); 187 EXPECT_EQ(3, focus_event_count_);
184 EXPECT_EQ(kButton1ASCII, last_control_name_); 188 EXPECT_EQ(kButton1ASCII, last_control_name_);
185 } 189 }
186 190
187 #endif // defined(TOOLKIT_VIEWS) 191 #endif // defined(TOOLKIT_VIEWS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698