| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_widget_host_view_views.h" | 5 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1071 // TODO(anicolao): plugin_container_manager_.CreatePluginContainer(id); | 1071 // TODO(anicolao): plugin_container_manager_.CreatePluginContainer(id); |
| 1072 } | 1072 } |
| 1073 | 1073 |
| 1074 void RenderWidgetHostViewViews::DestroyPluginContainer( | 1074 void RenderWidgetHostViewViews::DestroyPluginContainer( |
| 1075 gfx::PluginWindowHandle id) { | 1075 gfx::PluginWindowHandle id) { |
| 1076 // TODO(anicolao): plugin_container_manager_.DestroyPluginContainer(id); | 1076 // TODO(anicolao): plugin_container_manager_.DestroyPluginContainer(id); |
| 1077 } | 1077 } |
| 1078 | 1078 |
| 1079 #endif // TOOLKIT_USES_GTK | 1079 #endif // TOOLKIT_USES_GTK |
| 1080 | 1080 |
| 1081 #if defined(OS_POSIX) | 1081 #if defined(OS_POSIX) || defined(USE_AURA) |
| 1082 void RenderWidgetHostViewViews::GetDefaultScreenInfo( | 1082 void RenderWidgetHostViewViews::GetDefaultScreenInfo( |
| 1083 WebKit::WebScreenInfo* results) { | 1083 WebKit::WebScreenInfo* results) { |
| 1084 NOTIMPLEMENTED(); | 1084 NOTIMPLEMENTED(); |
| 1085 } | 1085 } |
| 1086 | 1086 |
| 1087 void RenderWidgetHostViewViews::GetScreenInfo(WebKit::WebScreenInfo* results) { | 1087 void RenderWidgetHostViewViews::GetScreenInfo(WebKit::WebScreenInfo* results) { |
| 1088 #if !defined(USE_AURA) | 1088 #if !defined(USE_AURA) |
| 1089 views::Widget* widget = GetWidget() ? GetWidget()->GetTopLevelWidget() : NULL; | 1089 views::Widget* widget = GetWidget() ? GetWidget()->GetTopLevelWidget() : NULL; |
| 1090 if (widget && widget->GetNativeView()) | 1090 if (widget && widget->GetNativeView()) |
| 1091 content::GetScreenInfoFromNativeWindow(widget->GetNativeView()->window, | 1091 content::GetScreenInfoFromNativeWindow(widget->GetNativeView()->window, |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1166 for (std::vector< base::Callback<void(void)> >::const_iterator | 1166 for (std::vector< base::Callback<void(void)> >::const_iterator |
| 1167 it = on_compositing_ended_callbacks_.begin(); | 1167 it = on_compositing_ended_callbacks_.begin(); |
| 1168 it != on_compositing_ended_callbacks_.end(); ++it) { | 1168 it != on_compositing_ended_callbacks_.end(); ++it) { |
| 1169 it->Run(); | 1169 it->Run(); |
| 1170 } | 1170 } |
| 1171 on_compositing_ended_callbacks_.clear(); | 1171 on_compositing_ended_callbacks_.clear(); |
| 1172 compositor->RemoveObserver(this); | 1172 compositor->RemoveObserver(this); |
| 1173 } | 1173 } |
| 1174 | 1174 |
| 1175 #endif | 1175 #endif |
| OLD | NEW |