| 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 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1270 | 1270 |
| 1271 //////////////////////////////////////////////////////////////////////////////// | 1271 //////////////////////////////////////////////////////////////////////////////// |
| 1272 // RenderWidgetHostViewAura, aura::WindowDelegate implementation: | 1272 // RenderWidgetHostViewAura, aura::WindowDelegate implementation: |
| 1273 | 1273 |
| 1274 gfx::Size RenderWidgetHostViewAura::GetMinimumSize() const { | 1274 gfx::Size RenderWidgetHostViewAura::GetMinimumSize() const { |
| 1275 return gfx::Size(); | 1275 return gfx::Size(); |
| 1276 } | 1276 } |
| 1277 | 1277 |
| 1278 void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, | 1278 void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, |
| 1279 const gfx::Rect& new_bounds) { | 1279 const gfx::Rect& new_bounds) { |
| 1280 // We don't care about this one, we are always sized via SetSize() or | 1280 // We care about this only in fullscreen mode, where there is no |
| 1281 // SetBounds(). | 1281 // WebContentsViewAura. We are sized via SetSize() or SetBounds() by |
| 1282 // WebContentsViewAura in other cases. |
| 1283 if (is_fullscreen_) |
| 1284 SetSize(new_bounds.size()); |
| 1282 } | 1285 } |
| 1283 | 1286 |
| 1284 void RenderWidgetHostViewAura::OnFocus(aura::Window* old_focused_window) { | 1287 void RenderWidgetHostViewAura::OnFocus(aura::Window* old_focused_window) { |
| 1285 // We need to honor input bypass if the associated tab is does not want input. | 1288 // We need to honor input bypass if the associated tab is does not want input. |
| 1286 // This gives the current focused window a chance to be the text input | 1289 // This gives the current focused window a chance to be the text input |
| 1287 // client and handle events. | 1290 // client and handle events. |
| 1288 if (host_->ignore_input_events()) | 1291 if (host_->ignore_input_events()) |
| 1289 return; | 1292 return; |
| 1290 | 1293 |
| 1291 host_->GotFocus(); | 1294 host_->GotFocus(); |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1888 RenderWidgetHost* widget) { | 1891 RenderWidgetHost* widget) { |
| 1889 return new RenderWidgetHostViewAura(widget); | 1892 return new RenderWidgetHostViewAura(widget); |
| 1890 } | 1893 } |
| 1891 | 1894 |
| 1892 // static | 1895 // static |
| 1893 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 1896 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 1894 GetScreenInfoForWindow(results, NULL); | 1897 GetScreenInfoForWindow(results, NULL); |
| 1895 } | 1898 } |
| 1896 | 1899 |
| 1897 } // namespace content | 1900 } // namespace content |
| OLD | NEW |