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

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: all in destroy, plus mac Created 5 years, 1 month 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 2548 matching lines...) Expand 10 before | Expand all | Expand 10 after
2559 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const { 2559 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const {
2560 aura::Window* root_window = window_->GetRootWindow(); 2560 aura::Window* root_window = window_->GetRootWindow();
2561 if (!root_window) 2561 if (!root_window)
2562 return NULL; 2562 return NULL;
2563 return root_window->GetHost()->GetInputMethod(); 2563 return root_window->GetHost()->GetInputMethod();
2564 } 2564 }
2565 2565
2566 void RenderWidgetHostViewAura::Shutdown() { 2566 void RenderWidgetHostViewAura::Shutdown() {
2567 if (!in_shutdown_) { 2567 if (!in_shutdown_) {
2568 in_shutdown_ = true; 2568 in_shutdown_ = true;
2569 host_->Shutdown(); 2569 host_->ShutdownAndDestroyWidget(true);
2570 } 2570 }
2571 } 2571 }
2572 2572
2573 bool RenderWidgetHostViewAura::NeedsInputGrab() { 2573 bool RenderWidgetHostViewAura::NeedsInputGrab() {
2574 return popup_type_ == blink::WebPopupTypePage; 2574 return popup_type_ == blink::WebPopupTypePage;
2575 } 2575 }
2576 2576
2577 bool RenderWidgetHostViewAura::NeedsMouseCapture() { 2577 bool RenderWidgetHostViewAura::NeedsMouseCapture() {
2578 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 2578 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
2579 return NeedsInputGrab(); 2579 return NeedsInputGrab();
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
2974 2974
2975 //////////////////////////////////////////////////////////////////////////////// 2975 ////////////////////////////////////////////////////////////////////////////////
2976 // RenderWidgetHostViewBase, public: 2976 // RenderWidgetHostViewBase, public:
2977 2977
2978 // static 2978 // static
2979 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2979 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2980 GetScreenInfoForWindow(results, NULL); 2980 GetScreenInfoForWindow(results, NULL);
2981 } 2981 }
2982 2982
2983 } // namespace content 2983 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698