| 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 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1196 | 1196 |
| 1197 //////////////////////////////////////////////////////////////////////////////// | 1197 //////////////////////////////////////////////////////////////////////////////// |
| 1198 // RenderWidgetHostViewAura, aura::WindowDelegate implementation: | 1198 // RenderWidgetHostViewAura, aura::WindowDelegate implementation: |
| 1199 | 1199 |
| 1200 gfx::Size RenderWidgetHostViewAura::GetMinimumSize() const { | 1200 gfx::Size RenderWidgetHostViewAura::GetMinimumSize() const { |
| 1201 return gfx::Size(); | 1201 return gfx::Size(); |
| 1202 } | 1202 } |
| 1203 | 1203 |
| 1204 void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, | 1204 void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, |
| 1205 const gfx::Rect& new_bounds) { | 1205 const gfx::Rect& new_bounds) { |
| 1206 // We don't care about this one, we are always sized via SetSize() or | 1206 // We care about this only in fullscreen mode, where there is no |
| 1207 // SetBounds(). | 1207 // WebContentsViewAura. We are sized via SetSize() or SetBounds() by |
| 1208 // WebContentsViewAura in other cases. |
| 1209 if (is_fullscreen_) |
| 1210 SetSize(new_bounds.size()); |
| 1208 } | 1211 } |
| 1209 | 1212 |
| 1210 void RenderWidgetHostViewAura::OnFocus(aura::Window* old_focused_window) { | 1213 void RenderWidgetHostViewAura::OnFocus(aura::Window* old_focused_window) { |
| 1211 // We need to honor input bypass if the associated tab is does not want input. | 1214 // We need to honor input bypass if the associated tab is does not want input. |
| 1212 // This gives the current focused window a chance to be the text input | 1215 // This gives the current focused window a chance to be the text input |
| 1213 // client and handle events. | 1216 // client and handle events. |
| 1214 if (host_->ignore_input_events()) | 1217 if (host_->ignore_input_events()) |
| 1215 return; | 1218 return; |
| 1216 | 1219 |
| 1217 host_->GotFocus(); | 1220 host_->GotFocus(); |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1798 RenderWidgetHost* widget) { | 1801 RenderWidgetHost* widget) { |
| 1799 return new RenderWidgetHostViewAura(widget); | 1802 return new RenderWidgetHostViewAura(widget); |
| 1800 } | 1803 } |
| 1801 | 1804 |
| 1802 // static | 1805 // static |
| 1803 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 1806 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 1804 GetScreenInfoForWindow(results, NULL); | 1807 GetScreenInfoForWindow(results, NULL); |
| 1805 } | 1808 } |
| 1806 | 1809 |
| 1807 } // namespace content | 1810 } // namespace content |
| OLD | NEW |