diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 21:17:27 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 21:17:27 +0000 |
| commit | c9e2cbbbcad5f0ae5b9c5ccaf6a36a8a4a61e0e7 (patch) | |
| tree | e33d97dc2edae8702ddb6a17ba0d89a506412693 /gpu/demos | |
| parent | fc25fd35147b2d5e74d5450e8586592c6a10813d (diff) | |
| download | chromium_src-c9e2cbbbcad5f0ae5b9c5ccaf6a36a8a4a61e0e7.zip chromium_src-c9e2cbbbcad5f0ae5b9c5ccaf6a36a8a4a61e0e7.tar.gz chromium_src-c9e2cbbbcad5f0ae5b9c5ccaf6a36a8a4a61e0e7.tar.bz2 | |
ui: Move gl/ directory out of gfx/, up to ui/.
BUG=104040
R=ben@chromium.org
TBR=tony@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10392068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos')
| -rw-r--r-- | gpu/demos/demos.gyp | 2 | ||||
| -rw-r--r-- | gpu/demos/framework/main_exe.cc | 4 | ||||
| -rw-r--r-- | gpu/demos/framework/window.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index 5b2fdb4..c0c6bb5 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -44,7 +44,7 @@ '../gpu.gyp:gles2_implementation', '../../base/base.gyp:base', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../../ui/gfx/gl/gl.gyp:gl', + '../../ui/gl/gl.gyp:gl', '../../ui/ui.gyp:ui', ], 'sources': [ diff --git a/gpu/demos/framework/main_exe.cc b/gpu/demos/framework/main_exe.cc index 12d3828..2794381 100644 --- a/gpu/demos/framework/main_exe.cc +++ b/gpu/demos/framework/main_exe.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "gpu/demos/framework/window.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_surface.h" #if defined(TOOLKIT_GTK) #include <gtk/gtk.h> diff --git a/gpu/demos/framework/window.h b/gpu/demos/framework/window.h index 956f60f1..e9c9802 100644 --- a/gpu/demos/framework/window.h +++ b/gpu/demos/framework/window.h @@ -8,11 +8,11 @@ #include "base/memory/scoped_ptr.h" #include "gpu/command_buffer/client/gles2_cmd_helper.h" #include "gpu/command_buffer/service/command_buffer_service.h" -#include "gpu/command_buffer/service/gpu_scheduler.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface.h" +#include "gpu/command_buffer/service/gpu_scheduler.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" namespace gpu { |