| OLD | NEW |
| 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 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 | 448 |
| 449 tooltip_controller_.reset(new internal::TooltipController( | 449 tooltip_controller_.reset(new internal::TooltipController( |
| 450 drag_drop_controller_.get())); | 450 drag_drop_controller_.get())); |
| 451 AddEnvEventFilter(tooltip_controller_.get()); | 451 AddEnvEventFilter(tooltip_controller_.get()); |
| 452 | 452 |
| 453 InitRootWindowController(root_window_controller); | 453 InitRootWindowController(root_window_controller); |
| 454 | 454 |
| 455 // Initialize Primary RootWindow specific items. | 455 // Initialize Primary RootWindow specific items. |
| 456 status_area_widget_ = new internal::StatusAreaWidget(); | 456 status_area_widget_ = new internal::StatusAreaWidget(); |
| 457 status_area_widget_->CreateTrayViews(delegate_.get()); | 457 status_area_widget_->CreateTrayViews(delegate_.get()); |
| 458 status_area_widget_->Show(); | 458 if (delegate_.get() && delegate_->IsStatusAreaInitiallyVisible()) |
| 459 status_area_widget_->Show(); |
| 459 | 460 |
| 460 focus_cycler_.reset(new internal::FocusCycler()); | 461 focus_cycler_.reset(new internal::FocusCycler()); |
| 461 focus_cycler_->AddWidget(status_area_widget_); | 462 focus_cycler_->AddWidget(status_area_widget_); |
| 462 | 463 |
| 463 // This controller needs to be set before SetupManagedWindowMode. | 464 // This controller needs to be set before SetupManagedWindowMode. |
| 464 desktop_background_controller_.reset(new DesktopBackgroundController()); | 465 desktop_background_controller_.reset(new DesktopBackgroundController()); |
| 465 if (delegate_.get()) | 466 if (delegate_.get()) |
| 466 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); | 467 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); |
| 467 if (!user_wallpaper_delegate_.get()) | 468 if (!user_wallpaper_delegate_.get()) |
| 468 user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate()); | 469 user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate()); |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 779 } | 780 } |
| 780 | 781 |
| 781 void Shell::ShowCursor(bool visible) { | 782 void Shell::ShowCursor(bool visible) { |
| 782 RootWindowList root_windows = GetAllRootWindows(); | 783 RootWindowList root_windows = GetAllRootWindows(); |
| 783 for (RootWindowList::iterator iter = root_windows.begin(); | 784 for (RootWindowList::iterator iter = root_windows.begin(); |
| 784 iter != root_windows.end(); ++iter) | 785 iter != root_windows.end(); ++iter) |
| 785 (*iter)->ShowCursor(visible); | 786 (*iter)->ShowCursor(visible); |
| 786 } | 787 } |
| 787 | 788 |
| 788 } // namespace ash | 789 } // namespace ash |
| OLD | NEW |