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

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

Issue 16897006: Move message_pump to base/message_loop. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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
« no previous file with comments | « remoting/host/posix/signal_handler.cc ('k') | ui/aura/demo/demo_main.cc » ('j') | 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/message_loop.h"
11 #include "base/strings/string_split.h" 11 #include "base/strings/string_split.h"
12 #include "base/time.h" 12 #include "base/time.h"
13 #include "third_party/khronos/GLES2/gl2.h" 13 #include "third_party/khronos/GLES2/gl2.h"
14 #include "third_party/skia/include/core/SkXfermode.h" 14 #include "third_party/skia/include/core/SkXfermode.h"
15 #include "ui/aura/client/default_capture_client.h" 15 #include "ui/aura/client/default_capture_client.h"
16 #include "ui/aura/env.h" 16 #include "ui/aura/env.h"
17 #include "ui/aura/focus_manager.h" 17 #include "ui/aura/focus_manager.h"
18 #include "ui/aura/root_window.h" 18 #include "ui/aura/root_window.h"
19 #include "ui/aura/test/test_screen.h" 19 #include "ui/aura/test/test_screen.h"
20 #include "ui/aura/window.h" 20 #include "ui/aura/window.h"
21 #include "ui/base/hit_test.h" 21 #include "ui/base/hit_test.h"
22 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
23 #include "ui/base/ui_base_paths.h" 23 #include "ui/base/ui_base_paths.h"
24 #include "ui/compositor/compositor.h" 24 #include "ui/compositor/compositor.h"
25 #include "ui/compositor/compositor_observer.h" 25 #include "ui/compositor/compositor_observer.h"
26 #include "ui/compositor/debug_utils.h" 26 #include "ui/compositor/debug_utils.h"
27 #include "ui/compositor/layer.h" 27 #include "ui/compositor/layer.h"
28 #include "ui/gfx/canvas.h" 28 #include "ui/gfx/canvas.h"
29 #include "ui/gfx/rect.h" 29 #include "ui/gfx/rect.h"
30 #include "ui/gfx/skia_util.h" 30 #include "ui/gfx/skia_util.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/WebKit/public/platform/WebGraphicsContext3D.h" 34 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
35 #include "third_party/khronos/GLES2/gl2ext.h" 35 #include "third_party/khronos/GLES2/gl2ext.h"
36 36
37 #if defined(USE_X11) 37 #if defined(USE_X11)
38 #include "base/message_pump_aurax11.h" 38 #include "base/message_loop/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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 ui::PrintLayerHierarchy(root_window->layer(), gfx::Point(100, 100)); 354 ui::PrintLayerHierarchy(root_window->layer(), gfx::Point(100, 100));
355 #endif 355 #endif
356 356
357 root_window->ShowRootWindow(); 357 root_window->ShowRootWindow();
358 base::MessageLoopForUI::current()->Run(); 358 base::MessageLoopForUI::current()->Run();
359 focus_client.reset(); 359 focus_client.reset();
360 root_window.reset(); 360 root_window.reset();
361 361
362 return 0; 362 return 0;
363 } 363 }
OLDNEW
« no previous file with comments | « remoting/host/posix/signal_handler.cc ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698