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

Side by Side Diff: chrome/browser/ui/views/accessibility_event_router_views_unittest.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 <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/accessibility/accessibility_extension_api.h" 10 #include "chrome/browser/accessibility/accessibility_extension_api.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 virtual bool UseTransparentWindows() const OVERRIDE { 75 virtual bool UseTransparentWindows() const OVERRIDE {
76 return false; 76 return false;
77 } 77 }
78 virtual void AddRef() OVERRIDE {} 78 virtual void AddRef() OVERRIDE {}
79 virtual void ReleaseRef() OVERRIDE {} 79 virtual void ReleaseRef() OVERRIDE {}
80 80
81 virtual int GetDispositionForEvent(int event_flags) OVERRIDE { 81 virtual int GetDispositionForEvent(int event_flags) OVERRIDE {
82 return 0; 82 return 0;
83 } 83 }
84 84
85 #if defined(USE_AURA)
86 virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper(
87 views::NativeWidgetAura* native_widget) OVERRIDE {
88 return NULL;
89 }
90 #endif
91
92 DISALLOW_COPY_AND_ASSIGN(AccessibilityViewsDelegate); 85 DISALLOW_COPY_AND_ASSIGN(AccessibilityViewsDelegate);
93 }; 86 };
94 87
95 class AccessibilityWindowDelegate : public views::WidgetDelegate { 88 class AccessibilityWindowDelegate : public views::WidgetDelegate {
96 public: 89 public:
97 explicit AccessibilityWindowDelegate(views::View* contents) 90 explicit AccessibilityWindowDelegate(views::View* contents)
98 : contents_(contents) { } 91 : contents_(contents) { }
99 92
100 // Overridden from views::WidgetDelegate: 93 // Overridden from views::WidgetDelegate:
101 virtual void DeleteDelegate() OVERRIDE { delete this; } 94 virtual void DeleteDelegate() OVERRIDE { delete this; }
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 326
334 // Test that we got the event with the expected name and context. 327 // Test that we got the event with the expected name and context.
335 EXPECT_EQ(1, focus_event_count_); 328 EXPECT_EQ(1, focus_event_count_);
336 EXPECT_EQ(kButtonNameASCII, last_control_name_); 329 EXPECT_EQ(kButtonNameASCII, last_control_name_);
337 EXPECT_EQ(kAlertTextASCII, last_control_context_); 330 EXPECT_EQ(kAlertTextASCII, last_control_context_);
338 331
339 window->CloseNow(); 332 window->CloseNow();
340 } 333 }
341 334
342 #endif // defined(TOOLKIT_VIEWS) 335 #endif // defined(TOOLKIT_VIEWS)
OLDNEW
« no previous file with comments | « chrome/browser/ui/tabs/dock_info_aura.cc ('k') | chrome/browser/ui/views/ash/color_chooser_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698