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

Side by Side Diff: ui/views/test/widget_test_mac.mm

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits. Created 5 years, 5 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
« no previous file with comments | « ui/views/test/widget_test_aura.cc ('k') | ui/views/view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/views/test/widget_test.h" 5 #include "ui/views/test/widget_test.h"
6 6
7 #include <Cocoa/Cocoa.h> 7 #include <Cocoa/Cocoa.h>
8 8
9 #import "base/mac/scoped_nsobject.h" 9 #import "base/mac/scoped_nsobject.h"
10 #import "base/mac/scoped_objc_class_swizzler.h" 10 #import "base/mac/scoped_objc_class_swizzler.h"
11 #import "ui/views/cocoa/bridged_native_widget.h"
11 #include "ui/views/widget/root_view.h" 12 #include "ui/views/widget/root_view.h"
12 13
13 @interface IsKeyWindowDonor : NSObject 14 @interface IsKeyWindowDonor : NSObject
14 @end 15 @end
15 16
16 @implementation IsKeyWindowDonor 17 @implementation IsKeyWindowDonor
17 - (BOOL)isKeyWindow { 18 - (BOOL)isKeyWindow {
18 return YES; 19 return YES;
19 } 20 }
20 @end 21 @end
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // static 102 // static
102 ui::EventProcessor* WidgetTest::GetEventProcessor(Widget* widget) { 103 ui::EventProcessor* WidgetTest::GetEventProcessor(Widget* widget) {
103 return static_cast<internal::RootView*>(widget->GetRootView()); 104 return static_cast<internal::RootView*>(widget->GetRootView());
104 } 105 }
105 106
106 // static 107 // static
107 scoped_ptr<WidgetTest::FakeActivation> WidgetTest::FakeWidgetIsActiveAlways() { 108 scoped_ptr<WidgetTest::FakeActivation> WidgetTest::FakeWidgetIsActiveAlways() {
108 return make_scoped_ptr(new FakeActivationMac); 109 return make_scoped_ptr(new FakeActivationMac);
109 } 110 }
110 111
112 // static
113 ui::internal::InputMethodDelegate* WidgetTest::GetInputMethodDelegateForWidget(
114 Widget* widget) {
115 return NativeWidgetMac::GetBridgeForNativeWindow(widget->GetNativeWindow());
116 }
117
111 } // namespace test 118 } // namespace test
112 } // namespace views 119 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/test/widget_test_aura.cc ('k') | ui/views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698