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

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

Issue 1453803002: Separate RenderViewHost from RenderWidgetHost, part 10: shutdown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nick's nits Created 5 years 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 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2566 matching lines...) Expand 10 before | Expand all | Expand 10 after
2577 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const { 2577 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const {
2578 aura::Window* root_window = window_->GetRootWindow(); 2578 aura::Window* root_window = window_->GetRootWindow();
2579 if (!root_window) 2579 if (!root_window)
2580 return NULL; 2580 return NULL;
2581 return root_window->GetHost()->GetInputMethod(); 2581 return root_window->GetHost()->GetInputMethod();
2582 } 2582 }
2583 2583
2584 void RenderWidgetHostViewAura::Shutdown() { 2584 void RenderWidgetHostViewAura::Shutdown() {
2585 if (!in_shutdown_) { 2585 if (!in_shutdown_) {
2586 in_shutdown_ = true; 2586 in_shutdown_ = true;
2587 host_->Shutdown(); 2587 host_->ShutdownAndDestroyWidget(true);
2588 } 2588 }
2589 } 2589 }
2590 2590
2591 bool RenderWidgetHostViewAura::NeedsInputGrab() { 2591 bool RenderWidgetHostViewAura::NeedsInputGrab() {
2592 return popup_type_ == blink::WebPopupTypePage; 2592 return popup_type_ == blink::WebPopupTypePage;
2593 } 2593 }
2594 2594
2595 bool RenderWidgetHostViewAura::NeedsMouseCapture() { 2595 bool RenderWidgetHostViewAura::NeedsMouseCapture() {
2596 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 2596 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
2597 return NeedsInputGrab(); 2597 return NeedsInputGrab();
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
2990 2990
2991 //////////////////////////////////////////////////////////////////////////////// 2991 ////////////////////////////////////////////////////////////////////////////////
2992 // RenderWidgetHostViewBase, public: 2992 // RenderWidgetHostViewBase, public:
2993 2993
2994 // static 2994 // static
2995 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2995 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2996 GetScreenInfoForWindow(results, NULL); 2996 GetScreenInfoForWindow(results, NULL);
2997 } 2997 }
2998 2998
2999 } // namespace content 2999 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698