Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(499)

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_views_gtk.cc

Issue 7314021: Clean up .gypi and no-op GetCompositingSurface on TOUCH_UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_widget_host_view_views_touch.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ui/base/keycodes/keyboard_code_conversion_gtk.h" 7 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
8 #include "ui/base/x/x11_util.h" 8 #include "ui/base/x/x11_util.h"
9 #include "ui/gfx/gtk_native_view_id_manager.h" 9 #include "ui/gfx/gtk_native_view_id_manager.h"
10 #include "views/widget/native_widget_gtk.h" 10 #include "views/widget/native_widget_gtk.h"
(...skipping 21 matching lines...) Expand all
32 // TODO(anicolao): plugin_container_manager_.DestroyPluginContainer(id); 32 // TODO(anicolao): plugin_container_manager_.DestroyPluginContainer(id);
33 } 33 }
34 34
35 void RenderWidgetHostViewViews::AcceleratedCompositingActivated( 35 void RenderWidgetHostViewViews::AcceleratedCompositingActivated(
36 bool activated) { 36 bool activated) {
37 // TODO(anicolao): figure out if we need something here 37 // TODO(anicolao): figure out if we need something here
38 if (activated) 38 if (activated)
39 NOTIMPLEMENTED(); 39 NOTIMPLEMENTED();
40 } 40 }
41 41
42 #if !defined(TOUCH_UI)
42 gfx::PluginWindowHandle RenderWidgetHostViewViews::GetCompositingSurface() { 43 gfx::PluginWindowHandle RenderWidgetHostViewViews::GetCompositingSurface() {
43 GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance(); 44 GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance();
44 gfx::PluginWindowHandle surface = gfx::kNullPluginWindow; 45 gfx::PluginWindowHandle surface = gfx::kNullPluginWindow;
45 gfx::NativeViewId view_id = gfx::IdFromNativeView(GetInnerNativeView()); 46 gfx::NativeViewId view_id = gfx::IdFromNativeView(GetInnerNativeView());
46 47
47 if (!manager->GetXIDForId(&surface, view_id)) { 48 if (!manager->GetXIDForId(&surface, view_id)) {
48 DLOG(ERROR) << "Can't find XID for view id " << view_id; 49 DLOG(ERROR) << "Can't find XID for view id " << view_id;
49 } 50 }
50 return surface; 51 return surface;
51 } 52 }
53 #endif
52 54
53 gfx::NativeView RenderWidgetHostViewViews::GetInnerNativeView() const { 55 gfx::NativeView RenderWidgetHostViewViews::GetInnerNativeView() const {
54 // TODO(sad): Ideally this function should be equivalent to GetNativeView, and 56 // TODO(sad): Ideally this function should be equivalent to GetNativeView, and
55 // NativeWidgetGtk-specific function call should not be necessary. 57 // NativeWidgetGtk-specific function call should not be necessary.
56 const views::Widget* widget = GetWidget(); 58 const views::Widget* widget = GetWidget();
57 const views::NativeWidget* native = widget ? widget->native_widget() : NULL; 59 const views::NativeWidget* native = widget ? widget->native_widget() : NULL;
58 return native ? static_cast<const views::NativeWidgetGtk*>(native)-> 60 return native ? static_cast<const views::NativeWidgetGtk*>(native)->
59 window_contents() : NULL; 61 window_contents() : NULL;
60 } 62 }
61 63
62 void RenderWidgetHostViewViews::ShowCurrentCursor() { 64 void RenderWidgetHostViewViews::ShowCurrentCursor() {
63 // The widget may not have a window. If that's the case, abort mission. This 65 // The widget may not have a window. If that's the case, abort mission. This
64 // is the same issue as that explained above in Paint(). 66 // is the same issue as that explained above in Paint().
65 if (!GetInnerNativeView() || !GetInnerNativeView()->window) 67 if (!GetInnerNativeView() || !GetInnerNativeView()->window)
66 return; 68 return;
67 69
68 native_cursor_ = current_cursor_.GetNativeCursor(); 70 native_cursor_ = current_cursor_.GetNativeCursor();
69 } 71 }
70 72
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_widget_host_view_views_touch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698