media/tools/shader_bench/shader_bench.cc - Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/tools/shader_bench/shader_bench.cc

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix mac_rel Created 8 years, 7 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:

Index: media/tools/shader_bench/shader_bench.cc

diff --git a/media/tools/shader_bench/shader_bench.cc b/media/tools/shader_bench/shader_bench.cc

index 83a2bb1430c1cdc3d25bf8c48aabf7e2ec30e218..22c7fa52fd48bd4025cff8b0edc2b0c9c26bbf09 100644

--- a/media/tools/shader_bench/shader_bench.cc

+++ b/media/tools/shader_bench/shader_bench.cc

@@ -2,10 +2,10 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include <deque>

-#include <ostream>

#include <stdio.h>

#include <stdlib.h>

+#include <deque>

+#include <ostream>

#include "base/at_exit.h"

#include "base/bind.h"

@@ -18,11 +18,11 @@

#include "media/tools/shader_bench/gpu_color_painter.h"

#include "media/tools/shader_bench/painter.h"

#include "media/tools/shader_bench/window.h"

-#include "ui/gfx/gl/gl_bindings.h"

-#include "ui/gfx/gl/gl_context.h"

-#include "ui/gfx/gl/gl_implementation.h"

-#include "ui/gfx/gl/gl_surface.h"

#include "ui/gfx/native_widget_types.h"

+#include "ui/gl/gl_bindings.h"

+#include "ui/gl/gl_context.h"

+#include "ui/gl/gl_implementation.h"

+#include "ui/gl/gl_surface.h"

#if defined(TOOLKIT_GTK)

#include <gtk/gtk.h>