| 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 <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 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1180 // Aura doesn't use GetBackingStore for accelerated pages, so it doesn't | 1180 // Aura doesn't use GetBackingStore for accelerated pages, so it doesn't |
| 1181 // matter what is returned here as GetBackingStore is the only caller of this | 1181 // matter what is returned here as GetBackingStore is the only caller of this |
| 1182 // method. TODO(jbates) implement this if other Aura code needs it. | 1182 // method. TODO(jbates) implement this if other Aura code needs it. |
| 1183 return false; | 1183 return false; |
| 1184 } | 1184 } |
| 1185 | 1185 |
| 1186 void RenderWidgetHostViewAura::GetScreenInfo(WebScreenInfo* results) { | 1186 void RenderWidgetHostViewAura::GetScreenInfo(WebScreenInfo* results) { |
| 1187 GetScreenInfoForWindow(results, window_->GetRootWindow() ? window_ : NULL); | 1187 GetScreenInfoForWindow(results, window_->GetRootWindow() ? window_ : NULL); |
| 1188 } | 1188 } |
| 1189 | 1189 |
| 1190 bool RenderWidgetHostViewAura::GetScreenColorProfile( | |
| 1191 std::vector<char>* color_profile) { | |
| 1192 DCHECK(color_profile->empty()); | |
| 1193 gfx::Rect bounds(window_->GetToplevelWindow()->GetBoundsInScreen()); | |
| 1194 return gfx::GetDisplayColorProfile(bounds, color_profile); | |
| 1195 } | |
| 1196 | |
| 1197 gfx::Rect RenderWidgetHostViewAura::GetBoundsInRootWindow() { | 1190 gfx::Rect RenderWidgetHostViewAura::GetBoundsInRootWindow() { |
| 1198 aura::Window* top_level = window_->GetToplevelWindow(); | 1191 aura::Window* top_level = window_->GetToplevelWindow(); |
| 1199 gfx::Rect bounds(top_level->GetBoundsInScreen()); | 1192 gfx::Rect bounds(top_level->GetBoundsInScreen()); |
| 1200 | 1193 |
| 1201 #if defined(OS_WIN) | 1194 #if defined(OS_WIN) |
| 1202 // TODO(zturner,iyengar): This will break when we remove support for NPAPI and | 1195 // TODO(zturner,iyengar): This will break when we remove support for NPAPI and |
| 1203 // remove the legacy hwnd, so a better fix will need to be decided when that | 1196 // remove the legacy hwnd, so a better fix will need to be decided when that |
| 1204 // happens. | 1197 // happens. |
| 1205 if (UsesNativeWindowFrame()) { | 1198 if (UsesNativeWindowFrame()) { |
| 1206 // aura::Window doesn't take into account non-client area of native windows | 1199 // aura::Window doesn't take into account non-client area of native windows |
| (...skipping 1817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3024 | 3017 |
| 3025 //////////////////////////////////////////////////////////////////////////////// | 3018 //////////////////////////////////////////////////////////////////////////////// |
| 3026 // RenderWidgetHostViewBase, public: | 3019 // RenderWidgetHostViewBase, public: |
| 3027 | 3020 |
| 3028 // static | 3021 // static |
| 3029 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3022 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3030 GetScreenInfoForWindow(results, NULL); | 3023 GetScreenInfoForWindow(results, NULL); |
| 3031 } | 3024 } |
| 3032 | 3025 |
| 3033 } // namespace content | 3026 } // namespace content |
| OLD | NEW |