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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pls be green! Created 5 years, 6 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
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 "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 2449 matching lines...) Expand 10 before | Expand all | Expand 10 after
2460 aura::client::GetCursorClient(root_window); 2460 aura::client::GetCursorClient(root_window);
2461 if (cursor_client) { 2461 if (cursor_client) {
2462 cursor_client->SetCursor(cursor); 2462 cursor_client->SetCursor(cursor);
2463 } 2463 }
2464 } 2464 }
2465 2465
2466 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const { 2466 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const {
2467 aura::Window* root_window = window_->GetRootWindow(); 2467 aura::Window* root_window = window_->GetRootWindow();
2468 if (!root_window) 2468 if (!root_window)
2469 return NULL; 2469 return NULL;
2470 return root_window->GetProperty(aura::client::kRootWindowInputMethodKey); 2470 return root_window->GetHost()->GetInputMethod();
2471 //return root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
Avi (use Gerrit) 2015/06/01 15:13:39 don't commit commented-out code
Shu Chen 2015/06/02 04:11:16 Done.
2471 } 2472 }
2472 2473
2473 void RenderWidgetHostViewAura::Shutdown() { 2474 void RenderWidgetHostViewAura::Shutdown() {
2474 if (!in_shutdown_) { 2475 if (!in_shutdown_) {
2475 in_shutdown_ = true; 2476 in_shutdown_ = true;
2476 host_->Shutdown(); 2477 host_->Shutdown();
2477 } 2478 }
2478 } 2479 }
2479 2480
2480 bool RenderWidgetHostViewAura::NeedsInputGrab() { 2481 bool RenderWidgetHostViewAura::NeedsInputGrab() {
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
2811 2812
2812 //////////////////////////////////////////////////////////////////////////////// 2813 ////////////////////////////////////////////////////////////////////////////////
2813 // RenderWidgetHostViewBase, public: 2814 // RenderWidgetHostViewBase, public:
2814 2815
2815 // static 2816 // static
2816 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2817 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2817 GetScreenInfoForWindow(results, NULL); 2818 GetScreenInfoForWindow(results, NULL);
2818 } 2819 }
2819 2820
2820 } // namespace content 2821 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698