diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 05:19:32 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 05:19:32 +0000 |
| commit | 056ce05075d1eccc591007b553acf1a77c9984da (patch) | |
| tree | 0120aab5ede38d13baf801b95b18f2c073657721 /ui/aura/demo | |
| parent | 21d32ecf459324e55d24a84a4fc89d9166fa4fc8 (diff) | |
| download | chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.zip chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.tar.gz chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.tar.bz2 | |
Rename RootWindow -> WindowEventDispatcher.
http://crbug.com/308843
R=sky@chromium.org
Review URL: https://codereview.chromium.org/172743002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/demo')
| -rw-r--r-- | ui/aura/demo/demo_main.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index b14a70e..c958aa9 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -118,12 +118,12 @@ int DemoMain() { aura::Env::CreateInstance(); scoped_ptr<aura::TestScreen> test_screen(aura::TestScreen::Create()); gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get()); - scoped_ptr<aura::RootWindow> root_window( + scoped_ptr<aura::WindowEventDispatcher> dispatcher( test_screen->CreateRootWindowForPrimaryDisplay()); scoped_ptr<DemoWindowTreeClient> window_tree_client(new DemoWindowTreeClient( - root_window->window())); + dispatcher->window())); aura::test::TestFocusClient focus_client; - aura::client::SetFocusClient(root_window->window(), &focus_client); + aura::client::SetFocusClient(dispatcher->window(), &focus_client); // Create a hierarchy of test windows. DemoWindowDelegate window_delegate1(SK_ColorBLUE); @@ -133,7 +133,7 @@ int DemoMain() { window1.SetBounds(gfx::Rect(100, 100, 400, 400)); window1.Show(); aura::client::ParentWindowWithContext( - &window1, root_window->window(), gfx::Rect()); + &window1, dispatcher->window(), gfx::Rect()); DemoWindowDelegate window_delegate2(SK_ColorRED); aura::Window window2(&window_delegate2); @@ -142,7 +142,7 @@ int DemoMain() { window2.SetBounds(gfx::Rect(200, 200, 350, 350)); window2.Show(); aura::client::ParentWindowWithContext( - &window2, root_window->window(), gfx::Rect()); + &window2, dispatcher->window(), gfx::Rect()); DemoWindowDelegate window_delegate3(SK_ColorGREEN); aura::Window window3(&window_delegate3); @@ -152,7 +152,7 @@ int DemoMain() { window3.Show(); window2.AddChild(&window3); - root_window->host()->Show(); + dispatcher->host()->Show(); base::MessageLoopForUI::current()->Run(); return 0; |