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

Side by Side Diff: ui/aura/bench/bench_main.cc

Issue 11971020: Update some #includes for headers that have moved from WebKit/chromium/public/platform/ to Platform… (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 11 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 | « ui/aura/bench/DEPS ('k') | no next file » | 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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/i18n/icu_util.h" 8 #include "base/i18n/icu_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 15 matching lines...) Expand all
26 #include "ui/compositor/compositor_observer.h" 26 #include "ui/compositor/compositor_observer.h"
27 #include "ui/compositor/debug_utils.h" 27 #include "ui/compositor/debug_utils.h"
28 #include "ui/compositor/layer.h" 28 #include "ui/compositor/layer.h"
29 #include "ui/compositor/test/compositor_test_support.h" 29 #include "ui/compositor/test/compositor_test_support.h"
30 #include "ui/gfx/canvas.h" 30 #include "ui/gfx/canvas.h"
31 #include "ui/gfx/rect.h" 31 #include "ui/gfx/rect.h"
32 #include "ui/gfx/skia_util.h" 32 #include "ui/gfx/skia_util.h"
33 #ifndef GL_GLEXT_PROTOTYPES 33 #ifndef GL_GLEXT_PROTOTYPES
34 #define GL_GLEXT_PROTOTYPES 1 34 #define GL_GLEXT_PROTOTYPES 1
35 #endif 35 #endif
36 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
36 #include "third_party/khronos/GLES2/gl2ext.h" 37 #include "third_party/khronos/GLES2/gl2ext.h"
37 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h"
38 38
39 #if defined(USE_X11) 39 #if defined(USE_X11)
40 #include "base/message_pump_aurax11.h" 40 #include "base/message_pump_aurax11.h"
41 #endif 41 #endif
42 42
43 using base::TimeTicks; 43 using base::TimeTicks;
44 using ui::Compositor; 44 using ui::Compositor;
45 using ui::Layer; 45 using ui::Layer;
46 using ui::LayerDelegate; 46 using ui::LayerDelegate;
47 using WebKit::WebGraphicsContext3D; 47 using WebKit::WebGraphicsContext3D;
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 353
354 root_window->ShowRootWindow(); 354 root_window->ShowRootWindow();
355 MessageLoopForUI::current()->Run(); 355 MessageLoopForUI::current()->Run();
356 focus_client.reset(); 356 focus_client.reset();
357 root_window.reset(); 357 root_window.reset();
358 358
359 ui::CompositorTestSupport::Terminate(); 359 ui::CompositorTestSupport::Terminate();
360 360
361 return 0; 361 return 0;
362 } 362 }
OLDNEW
« no previous file with comments | « ui/aura/bench/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698