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

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: fixed bot failure: cast_shell_linux 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 2437 matching lines...) Expand 10 before | Expand all | Expand 10 after
2448 aura::client::GetCursorClient(root_window); 2448 aura::client::GetCursorClient(root_window);
2449 if (cursor_client) { 2449 if (cursor_client) {
2450 cursor_client->SetCursor(cursor); 2450 cursor_client->SetCursor(cursor);
2451 } 2451 }
2452 } 2452 }
2453 2453
2454 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const { 2454 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const {
2455 aura::Window* root_window = window_->GetRootWindow(); 2455 aura::Window* root_window = window_->GetRootWindow();
2456 if (!root_window) 2456 if (!root_window)
2457 return NULL; 2457 return NULL;
2458 return root_window->GetProperty(aura::client::kRootWindowInputMethodKey); 2458 return root_window->GetHost()->GetInputMethod();
2459 } 2459 }
2460 2460
2461 void RenderWidgetHostViewAura::Shutdown() { 2461 void RenderWidgetHostViewAura::Shutdown() {
2462 if (!in_shutdown_) { 2462 if (!in_shutdown_) {
2463 in_shutdown_ = true; 2463 in_shutdown_ = true;
2464 host_->Shutdown(); 2464 host_->Shutdown();
2465 } 2465 }
2466 } 2466 }
2467 2467
2468 bool RenderWidgetHostViewAura::NeedsInputGrab() { 2468 bool RenderWidgetHostViewAura::NeedsInputGrab() {
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
2798 2798
2799 //////////////////////////////////////////////////////////////////////////////// 2799 ////////////////////////////////////////////////////////////////////////////////
2800 // RenderWidgetHostViewBase, public: 2800 // RenderWidgetHostViewBase, public:
2801 2801
2802 // static 2802 // static
2803 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2803 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2804 GetScreenInfoForWindow(results, NULL); 2804 GetScreenInfoForWindow(results, NULL);
2805 } 2805 }
2806 2806
2807 } // namespace content 2807 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698