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

Side by Side Diff: ash/shell.cc

Issue 10545142: Remove root_window_ member from DesktopBackgroundController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 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 | « ash/desktop_background/desktop_background_controller.cc ('k') | no next file » | 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 "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/accelerators/focus_manager_factory.h" 10 #include "ash/accelerators/focus_manager_factory.h"
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 root_window_layout_ = new internal::RootWindowLayoutManager(root_window); 551 root_window_layout_ = new internal::RootWindowLayoutManager(root_window);
552 root_window->SetLayoutManager(root_window_layout_); 552 root_window->SetLayoutManager(root_window_layout_);
553 553
554 event_client_.reset(new internal::EventClientImpl(root_window)); 554 event_client_.reset(new internal::EventClientImpl(root_window));
555 555
556 status_area_widget_ = new internal::StatusAreaWidget(); 556 status_area_widget_ = new internal::StatusAreaWidget();
557 status_area_widget_->CreateTrayViews(delegate_.get()); 557 status_area_widget_->CreateTrayViews(delegate_.get());
558 status_area_widget_->Show(); 558 status_area_widget_->Show();
559 559
560 // This controller needs to be set before SetupManagedWindowMode. 560 // This controller needs to be set before SetupManagedWindowMode.
561 desktop_background_controller_.reset( 561 desktop_background_controller_.reset(new DesktopBackgroundController());
562 new DesktopBackgroundController(root_window));
563 if (delegate_.get()) 562 if (delegate_.get())
564 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); 563 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate());
565 if (!user_wallpaper_delegate_.get()) 564 if (!user_wallpaper_delegate_.get())
566 user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate()); 565 user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate());
567 566
568 if (delegate_.get()) 567 if (delegate_.get())
569 user_action_client_.reset(delegate_->CreateUserActionClient()); 568 user_action_client_.reset(delegate_->CreateUserActionClient());
570 if (user_action_client_.get()) 569 if (user_action_client_.get())
571 aura::client::SetUserActionClient(root_window, user_action_client_.get()); 570 aura::client::SetUserActionClient(root_window, user_action_client_.get());
572 571
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 void Shell::SetCursor(gfx::NativeCursor cursor) { 840 void Shell::SetCursor(gfx::NativeCursor cursor) {
842 // TODO(oshima): set cursor to all root windows. 841 // TODO(oshima): set cursor to all root windows.
843 GetPrimaryRootWindow()->SetCursor(cursor); 842 GetPrimaryRootWindow()->SetCursor(cursor);
844 } 843 }
845 844
846 void Shell::ShowCursor(bool visible) { 845 void Shell::ShowCursor(bool visible) {
847 GetPrimaryRootWindow()->ShowCursor(visible); 846 GetPrimaryRootWindow()->ShowCursor(visible);
848 } 847 }
849 848
850 } // namespace ash 849 } // namespace ash
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698