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 "content/browser/renderer_host/render_widget_host_view.h" | 5 #include "content/browser/renderer_host/render_widget_host_view.h" |
6 | 6 |
| 7 #include "base/logging.h" |
7 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
8 | 9 |
9 #if defined(OS_MACOSX) | 10 #if defined(OS_MACOSX) |
10 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact
ory.h" | 11 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact
ory.h" |
11 #endif | 12 #endif |
12 | 13 |
13 #if defined(TOUCH_UI) || defined(USE_AURA) | 14 #if defined(TOUCH_UI) || defined(USE_AURA) |
14 #include <gdk/gdkx.h> | 15 #include <gdk/gdkx.h> |
15 #include <gtk/gtk.h> | 16 #include <gtk/gtk.h> |
16 | 17 |
(...skipping 15 matching lines...) Expand all Loading... |
32 #if defined(TOUCH_UI) || defined(USE_AURA) | 33 #if defined(TOUCH_UI) || defined(USE_AURA) |
33 // static | 34 // static |
34 void RenderWidgetHostView::GetDefaultScreenInfo( | 35 void RenderWidgetHostView::GetDefaultScreenInfo( |
35 WebKit::WebScreenInfo* results) { | 36 WebKit::WebScreenInfo* results) { |
36 GdkWindow* gdk_window = | 37 GdkWindow* gdk_window = |
37 gdk_display_get_default_group(gdk_display_get_default()); | 38 gdk_display_get_default_group(gdk_display_get_default()); |
38 content::GetScreenInfoFromNativeWindow(gdk_window, results); | 39 content::GetScreenInfoFromNativeWindow(gdk_window, results); |
39 } | 40 } |
40 #endif | 41 #endif |
41 | 42 |
42 RenderWidgetHostView::~RenderWidgetHostView() {} | 43 RenderWidgetHostView::~RenderWidgetHostView() { |
| 44 DCHECK(!mouse_locked_); |
| 45 } |
43 | 46 |
44 void RenderWidgetHostView::SetBackground(const SkBitmap& background) { | 47 void RenderWidgetHostView::SetBackground(const SkBitmap& background) { |
45 background_ = background; | 48 background_ = background; |
46 } | 49 } |
OLD | NEW |