| OLD | NEW |
| 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 "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 919 gfx::Size RenderWidgetHostViewAura::GetMinimumSize() const { | 919 gfx::Size RenderWidgetHostViewAura::GetMinimumSize() const { |
| 920 return gfx::Size(); | 920 return gfx::Size(); |
| 921 } | 921 } |
| 922 | 922 |
| 923 void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, | 923 void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, |
| 924 const gfx::Rect& new_bounds) { | 924 const gfx::Rect& new_bounds) { |
| 925 // We don't care about this one, we are always sized via SetSize() or | 925 // We don't care about this one, we are always sized via SetSize() or |
| 926 // SetBounds(). | 926 // SetBounds(). |
| 927 } | 927 } |
| 928 | 928 |
| 929 void RenderWidgetHostViewAura::OnFocus() { | 929 void RenderWidgetHostViewAura::OnFocus(aura::Window* old_focused_window) { |
| 930 // We need to honor input bypass if the associated tab is does not want input. | 930 // We need to honor input bypass if the associated tab is does not want input. |
| 931 // This gives the current focused window a chance to be the text input | 931 // This gives the current focused window a chance to be the text input |
| 932 // client and handle events. | 932 // client and handle events. |
| 933 if (host_->ignore_input_events()) | 933 if (host_->ignore_input_events()) |
| 934 return; | 934 return; |
| 935 | 935 |
| 936 host_->GotFocus(); | 936 host_->GotFocus(); |
| 937 host_->SetActive(true); | 937 host_->SetActive(true); |
| 938 | 938 |
| 939 ui::InputMethod* input_method = GetInputMethod(); | 939 ui::InputMethod* input_method = GetInputMethod(); |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1387 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( | 1387 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( |
| 1388 RenderWidgetHost* widget) { | 1388 RenderWidgetHost* widget) { |
| 1389 return new RenderWidgetHostViewAura(widget); | 1389 return new RenderWidgetHostViewAura(widget); |
| 1390 } | 1390 } |
| 1391 | 1391 |
| 1392 // static | 1392 // static |
| 1393 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( | 1393 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( |
| 1394 WebKit::WebScreenInfo* results) { | 1394 WebKit::WebScreenInfo* results) { |
| 1395 GetScreenInfoForWindow(results, NULL); | 1395 GetScreenInfoForWindow(results, NULL); |
| 1396 } | 1396 } |
| OLD | NEW |