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

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: typos Created 8 years, 4 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') | 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"
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/shared/root_window_capture_client.h" 19 #include "ui/aura/shared/root_window_capture_client.h"
19 #include "ui/aura/window.h" 20 #include "ui/aura/window.h"
20 #include "ui/base/hit_test.h" 21 #include "ui/base/hit_test.h"
21 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
22 #include "ui/base/ui_base_paths.h" 23 #include "ui/base/ui_base_paths.h"
23 #include "ui/compositor/compositor.h" 24 #include "ui/compositor/compositor.h"
24 #include "ui/compositor/compositor_observer.h" 25 #include "ui/compositor/compositor_observer.h"
25 #include "ui/compositor/debug_utils.h" 26 #include "ui/compositor/debug_utils.h"
26 #include "ui/compositor/layer.h" 27 #include "ui/compositor/layer.h"
27 #include "ui/compositor/test/compositor_test_support.h" 28 #include "ui/compositor/test/compositor_test_support.h"
28 #include "ui/gfx/canvas.h" 29 #include "ui/gfx/canvas.h"
29 #include "ui/gfx/rect.h" 30 #include "ui/gfx/rect.h"
30 #include "ui/gfx/skia_util.h" 31 #include "ui/gfx/skia_util.h"
31 #include "third_party/khronos/GLES2/gl2.h"
32 #ifndef GL_GLEXT_PROTOTYPES 32 #ifndef GL_GLEXT_PROTOTYPES
33 #define GL_GLEXT_PROTOTYPES 1 33 #define GL_GLEXT_PROTOTYPES 1
34 #endif 34 #endif
35 #include "third_party/khronos/GLES2/gl2ext.h" 35 #include "third_party/khronos/GLES2/gl2ext.h"
36 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h" 36 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h"
37 37
38 #if defined(USE_X11) 38 #if defined(USE_X11)
39 #include "base/message_pump_aurax11.h" 39 #include "base/message_pump_aurax11.h"
40 #endif 40 #endif
41 41
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 layer_->SchedulePaint(gfx::Rect(layer_->bounds().size())); 272 layer_->SchedulePaint(gfx::Rect(layer_->bounds().size()));
273 } 273 }
274 274
275 private: 275 private:
276 ColoredLayer* layer_; 276 ColoredLayer* layer_;
277 Compositor* compositor_; 277 Compositor* compositor_;
278 278
279 DISALLOW_COPY_AND_ASSIGN(SoftwareScrollBench); 279 DISALLOW_COPY_AND_ASSIGN(SoftwareScrollBench);
280 }; 280 };
281 281
282 } // anonymous namespace 282 } // namespace
283 283
284 int main(int argc, char** argv) { 284 int main(int argc, char** argv) {
285 CommandLine::Init(argc, argv); 285 CommandLine::Init(argc, argv);
286 286
287 base::AtExitManager exit_manager; 287 base::AtExitManager exit_manager;
288 288
289 ui::RegisterPathProvider(); 289 ui::RegisterPathProvider();
290 icu_util::Initialize(); 290 icu_util::Initialize();
291 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 291 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
292 292
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 #endif 342 #endif
343 343
344 root_window->ShowRootWindow(); 344 root_window->ShowRootWindow();
345 MessageLoopForUI::current()->Run(); 345 MessageLoopForUI::current()->Run();
346 root_window.reset(); 346 root_window.reset();
347 347
348 ui::CompositorTestSupport::Terminate(); 348 ui::CompositorTestSupport::Terminate();
349 349
350 return 0; 350 return 0;
351 } 351 }
OLDNEW
« no previous file with comments | « no previous file | ui/aura/window_property.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698