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/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 2940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2951 if (is_fullscreen_ && !in_shutdown_ && !focusing_other_display) { | 2951 if (is_fullscreen_ && !in_shutdown_ && !focusing_other_display) { |
2952 in_shutdown_ = true; | 2952 in_shutdown_ = true; |
2953 host_->Shutdown(); | 2953 host_->Shutdown(); |
2954 } | 2954 } |
2955 } | 2955 } |
2956 } | 2956 } |
2957 | 2957 |
2958 //////////////////////////////////////////////////////////////////////////////// | 2958 //////////////////////////////////////////////////////////////////////////////// |
2959 // RenderWidgetHostViewAura, aura::RootWindowObserver implementation: | 2959 // RenderWidgetHostViewAura, aura::RootWindowObserver implementation: |
2960 | 2960 |
2961 void RenderWidgetHostViewAura::OnWindowTreeHostMoved( | 2961 void RenderWidgetHostViewAura::OnRootWindowHostMoved( |
2962 const aura::RootWindow* root, | 2962 const aura::RootWindow* root, |
2963 const gfx::Point& new_origin) { | 2963 const gfx::Point& new_origin) { |
2964 TRACE_EVENT1("ui", "RenderWidgetHostViewAura::OnWindowTreeHostMoved", | 2964 TRACE_EVENT1("ui", "RenderWidgetHostViewAura::OnRootWindowHostMoved", |
2965 "new_origin", new_origin.ToString()); | 2965 "new_origin", new_origin.ToString()); |
2966 | 2966 |
2967 UpdateScreenInfo(window_); | 2967 UpdateScreenInfo(window_); |
2968 } | 2968 } |
2969 | 2969 |
2970 //////////////////////////////////////////////////////////////////////////////// | 2970 //////////////////////////////////////////////////////////////////////////////// |
2971 // RenderWidgetHostViewAura, SoftwareFrameManagerClient implementation: | 2971 // RenderWidgetHostViewAura, SoftwareFrameManagerClient implementation: |
2972 | 2972 |
2973 void RenderWidgetHostViewAura::SoftwareFrameWasFreed( | 2973 void RenderWidgetHostViewAura::SoftwareFrameWasFreed( |
2974 uint32 output_surface_id, unsigned frame_id) { | 2974 uint32 output_surface_id, unsigned frame_id) { |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3364 RenderWidgetHost* widget) { | 3364 RenderWidgetHost* widget) { |
3365 return new RenderWidgetHostViewAura(widget); | 3365 return new RenderWidgetHostViewAura(widget); |
3366 } | 3366 } |
3367 | 3367 |
3368 // static | 3368 // static |
3369 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3369 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
3370 GetScreenInfoForWindow(results, NULL); | 3370 GetScreenInfoForWindow(results, NULL); |
3371 } | 3371 } |
3372 | 3372 |
3373 } // namespace content | 3373 } // namespace content |
OLD | NEW |