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

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

Issue 10441028: aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error in file added in the interim Created 8 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
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 17 matching lines...) Expand all
28 #include "ui/gfx/rect.h" 28 #include "ui/gfx/rect.h"
29 #include "ui/gfx/skia_util.h" 29 #include "ui/gfx/skia_util.h"
30 #include "third_party/khronos/GLES2/gl2.h" 30 #include "third_party/khronos/GLES2/gl2.h"
31 #ifndef GL_GLEXT_PROTOTYPES 31 #ifndef GL_GLEXT_PROTOTYPES
32 #define GL_GLEXT_PROTOTYPES 1 32 #define GL_GLEXT_PROTOTYPES 1
33 #endif 33 #endif
34 #include "third_party/khronos/GLES2/gl2ext.h" 34 #include "third_party/khronos/GLES2/gl2ext.h"
35 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h" 35 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h"
36 36
37 #if defined(USE_X11) 37 #if defined(USE_X11)
38 #include "base/message_pump_x.h" 38 #include "base/message_pump_aurax11.h"
39 #endif 39 #endif
40 40
41 using base::TimeTicks; 41 using base::TimeTicks;
42 using ui::Compositor; 42 using ui::Compositor;
43 using ui::Layer; 43 using ui::Layer;
44 using ui::LayerDelegate; 44 using ui::LayerDelegate;
45 using WebKit::WebGraphicsContext3D; 45 using WebKit::WebGraphicsContext3D;
46 46
47 namespace { 47 namespace {
48 48
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 #endif 323 #endif
324 324
325 root_window->ShowRootWindow(); 325 root_window->ShowRootWindow();
326 MessageLoopForUI::current()->Run(); 326 MessageLoopForUI::current()->Run();
327 root_window.reset(); 327 root_window.reset();
328 328
329 ui::CompositorTestSupport::Terminate(); 329 ui::CompositorTestSupport::Terminate();
330 330
331 return 0; 331 return 0;
332 } 332 }
OLDNEW
« no previous file with comments | « content/common/gpu/media/gles2_texture_to_egl_image_translator.cc ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698