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

Side by Side Diff: gpu/demos/framework/window_linux.cc

Issue 15995038: Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, print… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: better Created 7 years, 6 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 | « gpu/config/gpu_dx_diagnostics_win.cc ('k') | ipc/ipc_channel_win.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) 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 "gpu/demos/framework/window.h" 5 #include "gpu/demos/framework/window.h"
6 6
7 #include <gdk/gdkx.h> 7 #include <gdk/gdkx.h>
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "base/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 11
12 namespace { 12 namespace {
13 using gpu::demos::Window; 13 using gpu::demos::Window;
14 14
15 gboolean OnDelete(GtkWidget* widget, GdkEventExpose* event) { 15 gboolean OnDelete(GtkWidget* widget, GdkEventExpose* event) {
16 gtk_main_quit(); 16 gtk_main_quit();
17 return FALSE; 17 return FALSE;
18 } 18 }
19 19
20 gboolean OnExpose(GtkWidget* widget, GdkEventExpose* event, gpointer data) { 20 gboolean OnExpose(GtkWidget* widget, GdkEventExpose* event, gpointer data) {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 return GTK_WINDOW(hwnd); 54 return GTK_WINDOW(hwnd);
55 } 55 }
56 56
57 gfx::AcceleratedWidget Window::PluginWindow(gfx::NativeWindow hwnd) { 57 gfx::AcceleratedWidget Window::PluginWindow(gfx::NativeWindow hwnd) {
58 return GDK_WINDOW_XWINDOW(GTK_WIDGET(hwnd)->window); 58 return GDK_WINDOW_XWINDOW(GTK_WIDGET(hwnd)->window);
59 } 59 }
60 60
61 } // namespace demos 61 } // namespace demos
62 } // namespace gpu 62 } // namespace gpu
63 63
OLDNEW
« no previous file with comments | « gpu/config/gpu_dx_diagnostics_win.cc ('k') | ipc/ipc_channel_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698