| 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 "base/logging.h" |
| 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
| 9 | 9 |
| 10 #if defined(TOOLKIT_USES_GTK) | 10 #if defined(TOOLKIT_USES_GTK) |
| 11 #include <gdk/gdkx.h> | 11 #include <gdk/gdkx.h> |
| 12 #include <gtk/gtk.h> | 12 #include <gtk/gtk.h> |
| 13 | 13 |
| 14 #include "content/browser/renderer_host/gtk_window_utils.h" | 14 #include "content/browser/renderer_host/gtk_window_utils.h" |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 #if defined(TOUCH_UI) | 17 #if defined(TOUCH_UI) && !defined(USE_AURA) |
| 18 // static | 18 // static |
| 19 void RenderWidgetHostView::GetDefaultScreenInfo( | 19 void RenderWidgetHostView::GetDefaultScreenInfo( |
| 20 WebKit::WebScreenInfo* results) { | 20 WebKit::WebScreenInfo* results) { |
| 21 GdkWindow* gdk_window = | 21 GdkWindow* gdk_window = |
| 22 gdk_display_get_default_group(gdk_display_get_default()); | 22 gdk_display_get_default_group(gdk_display_get_default()); |
| 23 content::GetScreenInfoFromNativeWindow(gdk_window, results); | 23 content::GetScreenInfoFromNativeWindow(gdk_window, results); |
| 24 } | 24 } |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 RenderWidgetHostView::RenderWidgetHostView() | 27 RenderWidgetHostView::RenderWidgetHostView() |
| (...skipping 13 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 | 42 |
| 43 void RenderWidgetHostView::SelectionChanged(const string16& text, | 43 void RenderWidgetHostView::SelectionChanged(const string16& text, |
| 44 size_t offset, | 44 size_t offset, |
| 45 const ui::Range& range) { | 45 const ui::Range& range) { |
| 46 selection_text_ = text; | 46 selection_text_ = text; |
| 47 selection_text_offset_ = offset; | 47 selection_text_offset_ = offset; |
| 48 selection_range_.set_start(range.start()); | 48 selection_range_.set_start(range.start()); |
| 49 selection_range_.set_end(range.end()); | 49 selection_range_.set_end(range.end()); |
| 50 } | 50 } |
| OLD | NEW |