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

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

Issue 10808072: ui: No need to typedef testing::Test in unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | « no previous file | ui/aura/window_property.h » ('j') | ui/aura/window_property.h » ('J')
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"
11 #include "base/string_split.h" 11 #include "base/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/skia/include/core/SkXfermode.h" 14 #include "third_party/skia/include/core/SkXfermode.h"
14 #include "ui/aura/env.h" 15 #include "ui/aura/env.h"
15 #include "ui/aura/event.h" 16 #include "ui/aura/event.h"
16 #include "ui/aura/root_window.h" 17 #include "ui/aura/root_window.h"
17 #include "ui/aura/single_display_manager.h" 18 #include "ui/aura/single_display_manager.h"
18 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
19 #include "ui/base/hit_test.h" 20 #include "ui/base/hit_test.h"
20 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/base/ui_base_paths.h" 22 #include "ui/base/ui_base_paths.h"
22 #include "ui/compositor/compositor.h" 23 #include "ui/compositor/compositor.h"
23 #include "ui/compositor/compositor_observer.h" 24 #include "ui/compositor/compositor_observer.h"
24 #include "ui/compositor/debug_utils.h" 25 #include "ui/compositor/debug_utils.h"
25 #include "ui/compositor/layer.h" 26 #include "ui/compositor/layer.h"
26 #include "ui/compositor/test/compositor_test_support.h" 27 #include "ui/compositor/test/compositor_test_support.h"
27 #include "ui/gfx/canvas.h" 28 #include "ui/gfx/canvas.h"
28 #include "ui/gfx/rect.h" 29 #include "ui/gfx/rect.h"
29 #include "ui/gfx/skia_util.h" 30 #include "ui/gfx/skia_util.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_aurax11.h" 38 #include "base/message_pump_aurax11.h"
39 #endif 39 #endif
40 40
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 layer_->SchedulePaint(gfx::Rect(layer_->bounds().size())); 271 layer_->SchedulePaint(gfx::Rect(layer_->bounds().size()));
272 } 272 }
273 273
274 private: 274 private:
275 ColoredLayer* layer_; 275 ColoredLayer* layer_;
276 Compositor* compositor_; 276 Compositor* compositor_;
277 277
278 DISALLOW_COPY_AND_ASSIGN(SoftwareScrollBench); 278 DISALLOW_COPY_AND_ASSIGN(SoftwareScrollBench);
279 }; 279 };
280 280
281 } // anonymous namespace 281 } // namespace
282 282
283 int main(int argc, char** argv) { 283 int main(int argc, char** argv) {
284 CommandLine::Init(argc, argv); 284 CommandLine::Init(argc, argv);
285 285
286 base::AtExitManager exit_manager; 286 base::AtExitManager exit_manager;
287 287
288 ui::RegisterPathProvider(); 288 ui::RegisterPathProvider();
289 icu_util::Initialize(); 289 icu_util::Initialize();
290 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 290 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
291 291
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 #endif 338 #endif
339 339
340 root_window->ShowRootWindow(); 340 root_window->ShowRootWindow();
341 MessageLoopForUI::current()->Run(); 341 MessageLoopForUI::current()->Run();
342 root_window.reset(); 342 root_window.reset();
343 343
344 ui::CompositorTestSupport::Terminate(); 344 ui::CompositorTestSupport::Terminate();
345 345
346 return 0; 346 return 0;
347 } 347 }
OLDNEW
« no previous file with comments | « no previous file | ui/aura/window_property.h » ('j') | ui/aura/window_property.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698