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

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

Issue 11368010: Move aura shared and desktop classes to the views target. Note that the files don't actually move, … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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/aura.gyp ('k') | ui/aura/client/activation_change_observer.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/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/env.h" 16 #include "ui/aura/env.h"
16 #include "ui/aura/focus_manager.h" 17 #include "ui/aura/focus_manager.h"
17 #include "ui/aura/root_window.h" 18 #include "ui/aura/root_window.h"
18 #include "ui/aura/single_display_manager.h" 19 #include "ui/aura/single_display_manager.h"
19 #include "ui/aura/shared/root_window_capture_client.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/compositor/test/compositor_test_support.h" 28 #include "ui/compositor/test/compositor_test_support.h"
29 #include "ui/gfx/canvas.h" 29 #include "ui/gfx/canvas.h"
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 297
298 MessageLoop message_loop(MessageLoop::TYPE_UI); 298 MessageLoop message_loop(MessageLoop::TYPE_UI);
299 ui::CompositorTestSupport::Initialize(); 299 ui::CompositorTestSupport::Initialize();
300 aura::SingleDisplayManager* manager = new aura::SingleDisplayManager; 300 aura::SingleDisplayManager* manager = new aura::SingleDisplayManager;
301 manager->set_use_fullscreen_host_window(true); 301 manager->set_use_fullscreen_host_window(true);
302 aura::Env::GetInstance()->SetDisplayManager(manager); 302 aura::Env::GetInstance()->SetDisplayManager(manager);
303 scoped_ptr<aura::RootWindow> root_window( 303 scoped_ptr<aura::RootWindow> root_window(
304 aura::DisplayManager::CreateRootWindowForPrimaryDisplay()); 304 aura::DisplayManager::CreateRootWindowForPrimaryDisplay());
305 aura::client::SetCaptureClient( 305 aura::client::SetCaptureClient(
306 root_window.get(), 306 root_window.get(),
307 new aura::shared::RootWindowCaptureClient(root_window.get())); 307 new aura::client::DefaultCaptureClient(root_window.get()));
308 308
309 scoped_ptr<aura::FocusManager> focus_manager(new aura::FocusManager); 309 scoped_ptr<aura::FocusManager> focus_manager(new aura::FocusManager);
310 root_window->set_focus_manager(focus_manager.get()); 310 root_window->set_focus_manager(focus_manager.get());
311 311
312 // add layers 312 // add layers
313 ColoredLayer background(SK_ColorRED); 313 ColoredLayer background(SK_ColorRED);
314 background.SetBounds(root_window->bounds()); 314 background.SetBounds(root_window->bounds());
315 root_window->layer()->Add(&background); 315 root_window->layer()->Add(&background);
316 316
317 ColoredLayer window(SK_ColorBLUE); 317 ColoredLayer window(SK_ColorBLUE);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 351
352 root_window->ShowRootWindow(); 352 root_window->ShowRootWindow();
353 MessageLoopForUI::current()->Run(); 353 MessageLoopForUI::current()->Run();
354 focus_manager.reset(); 354 focus_manager.reset();
355 root_window.reset(); 355 root_window.reset();
356 356
357 ui::CompositorTestSupport::Terminate(); 357 ui::CompositorTestSupport::Terminate();
358 358
359 return 0; 359 return 0;
360 } 360 }
OLDNEW
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/client/activation_change_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698