| Index: media/tools/shader_bench/window_linux.cc
|
| diff --git a/media/tools/shader_bench/window_linux.cc b/media/tools/shader_bench/window_linux.cc
|
| index 1c43505833c7a52520d31b13e08b7fab7f91f172..6226c26a2934ba07db8adb945971c1da6c91ee72 100644
|
| --- a/media/tools/shader_bench/window_linux.cc
|
| +++ b/media/tools/shader_bench/window_linux.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -10,24 +10,22 @@
|
| #include <gdk/gdkx.h>
|
| #include <gtk/gtk.h>
|
|
|
| -namespace {
|
| +namespace media {
|
|
|
| -gboolean OnDelete(GtkWidget* widget, GdkEventExpose* event) {
|
| +static gboolean OnDelete(GtkWidget* widget, GdkEventExpose* event) {
|
| gtk_main_quit();
|
| return FALSE;
|
| }
|
|
|
| -gboolean OnExpose(GtkWidget* widget, GdkEventExpose* event, gpointer data) {
|
| - media::Window* window = reinterpret_cast<media::Window*>(data);
|
| +static gboolean OnExpose(GtkWidget* widget,
|
| + GdkEventExpose* event,
|
| + gpointer data) {
|
| + Window* window = reinterpret_cast<Window*>(data);
|
| if (window)
|
| window->OnPaint();
|
| return FALSE;
|
| }
|
|
|
| -} // namespace
|
| -
|
| -namespace media {
|
| -
|
| gfx::NativeWindow Window::CreateNativeWindow(int width, int height) {
|
| GtkWidget* hwnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
|
|
|
|