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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura/demo/demo_main.cc

Issue 9535025: Remove the singleton instance get/delete methods from RootWindow (yay) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/test_render_view_host.cc ('k') | ui/aura/root_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/demo/demo_main.cc
===================================================================
--- ui/aura/demo/demo_main.cc (revision 124527)
+++ ui/aura/demo/demo_main.cc (working copy)
@@ -88,7 +88,7 @@
MessageLoop message_loop(MessageLoop::TYPE_UI);
ui::CompositorTestSupport::Initialize();
- aura::RootWindow::GetInstance();
+ scoped_ptr<aura::RootWindow> root_window(new aura::RootWindow);
// Create a hierarchy of test windows.
DemoWindowDelegate window_delegate1(SK_ColorBLUE);
@@ -115,7 +115,7 @@
window3.Show();
window3.SetParent(&window2);
- aura::RootWindow::GetInstance()->ShowRootWindow();
+ root_window->ShowRootWindow();
MessageLoopForUI::current()->Run();
ui::CompositorTestSupport::Terminate();
« no previous file with comments | « content/browser/renderer_host/test_render_view_host.cc ('k') | ui/aura/root_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698