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

Side by Side Diff: ui/views/widget/native_widget_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/widget/native_widget_mac.h ('k') | ui/views/widget/native_widget_private.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/widget/native_widget_mac.h" 5 #include "ui/views/widget/native_widget_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/mac/foundation_util.h" 9 #include "base/mac/foundation_util.h"
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 void NativeWidgetMac::ReleaseCapture() { 207 void NativeWidgetMac::ReleaseCapture() {
208 if (bridge_) 208 if (bridge_)
209 bridge_->ReleaseCapture(); 209 bridge_->ReleaseCapture();
210 } 210 }
211 211
212 bool NativeWidgetMac::HasCapture() const { 212 bool NativeWidgetMac::HasCapture() const {
213 return bridge_ && bridge_->HasCapture(); 213 return bridge_ && bridge_->HasCapture();
214 } 214 }
215 215
216 InputMethod* NativeWidgetMac::CreateInputMethod() { 216 ui::InputMethod* NativeWidgetMac::GetInputMethod() {
217 return bridge_ ? bridge_->CreateInputMethod() : NULL; 217 return bridge_ ? bridge_->GetInputMethod() : NULL;
218 }
219
220 internal::InputMethodDelegate* NativeWidgetMac::GetInputMethodDelegate() {
221 return bridge_.get();
222 }
223
224 ui::InputMethod* NativeWidgetMac::GetHostInputMethod() {
225 return bridge_ ? bridge_->GetHostInputMethod() : NULL;
226 } 218 }
227 219
228 void NativeWidgetMac::CenterWindow(const gfx::Size& size) { 220 void NativeWidgetMac::CenterWindow(const gfx::Size& size) {
229 SetSize( 221 SetSize(
230 BridgedNativeWidget::GetWindowSizeForClientSize(GetNativeWindow(), size)); 222 BridgedNativeWidget::GetWindowSizeForClientSize(GetNativeWindow(), size));
231 // Note that this is not the precise center of screen, but it is the standard 223 // Note that this is not the precise center of screen, but it is the standard
232 // location for windows like dialogs to appear on screen for Mac. 224 // location for windows like dialogs to appear on screen for Mac.
233 // TODO(tapted): If there is a parent window, center in that instead. 225 // TODO(tapted): If there is a parent window, center in that instead.
234 [GetNativeWindow() center]; 226 [GetNativeWindow() center];
235 } 227 }
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 [[ViewsNSWindowCloseAnimator alloc] initWithWindow:window]; 685 [[ViewsNSWindowCloseAnimator alloc] initWithWindow:window];
694 } 686 }
695 687
696 - (void)animationDidEnd:(NSAnimation*)animation { 688 - (void)animationDidEnd:(NSAnimation*)animation {
697 [window_ close]; 689 [window_ close];
698 [animation_ setDelegate:nil]; 690 [animation_ setDelegate:nil];
699 [self release]; 691 [self release];
700 } 692 }
701 693
702 @end 694 @end
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_mac.h ('k') | ui/views/widget/native_widget_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698