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

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

Issue 2136193002: Fix crash on clicking on <select> tag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: refactored test Created 4 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 | « chrome/test/data/extensions/platform_apps/web_view/select/test.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2442 matching lines...) Expand 10 before | Expand all | Expand 10 after
2453 cursor = ui::kCursorPointer; 2453 cursor = ui::kCursorPointer;
2454 2454
2455 aura::client::CursorClient* cursor_client = 2455 aura::client::CursorClient* cursor_client =
2456 aura::client::GetCursorClient(root_window); 2456 aura::client::GetCursorClient(root_window);
2457 if (cursor_client) { 2457 if (cursor_client) {
2458 cursor_client->SetCursor(cursor); 2458 cursor_client->SetCursor(cursor);
2459 } 2459 }
2460 } 2460 }
2461 2461
2462 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const { 2462 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const {
2463 if (!window_)
2464 return nullptr;
2463 aura::Window* root_window = window_->GetRootWindow(); 2465 aura::Window* root_window = window_->GetRootWindow();
2464 if (!root_window) 2466 if (!root_window)
2465 return NULL; 2467 return nullptr;
2466 return root_window->GetHost()->GetInputMethod(); 2468 return root_window->GetHost()->GetInputMethod();
2467 } 2469 }
2468 2470
2469 void RenderWidgetHostViewAura::Shutdown() { 2471 void RenderWidgetHostViewAura::Shutdown() {
2470 if (!in_shutdown_) { 2472 if (!in_shutdown_) {
2471 in_shutdown_ = true; 2473 in_shutdown_ = true;
2472 host_->ShutdownAndDestroyWidget(true); 2474 host_->ShutdownAndDestroyWidget(true);
2473 } 2475 }
2474 } 2476 }
2475 2477
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
3005 3007
3006 //////////////////////////////////////////////////////////////////////////////// 3008 ////////////////////////////////////////////////////////////////////////////////
3007 // RenderWidgetHostViewBase, public: 3009 // RenderWidgetHostViewBase, public:
3008 3010
3009 // static 3011 // static
3010 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 3012 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
3011 GetScreenInfoForWindow(results, NULL); 3013 GetScreenInfoForWindow(results, NULL);
3012 } 3014 }
3013 3015
3014 } // namespace content 3016 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/data/extensions/platform_apps/web_view/select/test.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698