| 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 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 | 455 |
| 456 // StatusAreaWidget uses Shell's CapsLockDelegate. | 456 // StatusAreaWidget uses Shell's CapsLockDelegate. |
| 457 if (delegate_.get()) | 457 if (delegate_.get()) |
| 458 caps_lock_delegate_.reset(delegate_->CreateCapsLockDelegate()); | 458 caps_lock_delegate_.reset(delegate_->CreateCapsLockDelegate()); |
| 459 else | 459 else |
| 460 caps_lock_delegate_.reset(new CapsLockDelegateStub); | 460 caps_lock_delegate_.reset(new CapsLockDelegateStub); |
| 461 | 461 |
| 462 // Initialize Primary RootWindow specific items. | 462 // Initialize Primary RootWindow specific items. |
| 463 status_area_widget_ = new internal::StatusAreaWidget(); | 463 status_area_widget_ = new internal::StatusAreaWidget(); |
| 464 status_area_widget_->CreateTrayViews(delegate_.get()); | 464 status_area_widget_->CreateTrayViews(delegate_.get()); |
| 465 status_area_widget_->Show(); | 465 if (delegate_.get() && delegate_->IsStatusAreaInitiallyVisible()) |
| 466 status_area_widget_->Show(); |
| 466 | 467 |
| 467 focus_cycler_.reset(new internal::FocusCycler()); | 468 focus_cycler_.reset(new internal::FocusCycler()); |
| 468 focus_cycler_->AddWidget(status_area_widget_); | 469 focus_cycler_->AddWidget(status_area_widget_); |
| 469 | 470 |
| 470 // This controller needs to be set before SetupManagedWindowMode. | 471 // This controller needs to be set before SetupManagedWindowMode. |
| 471 desktop_background_controller_.reset(new DesktopBackgroundController()); | 472 desktop_background_controller_.reset(new DesktopBackgroundController()); |
| 472 if (delegate_.get()) | 473 if (delegate_.get()) |
| 473 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); | 474 user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); |
| 474 if (!user_wallpaper_delegate_.get()) | 475 if (!user_wallpaper_delegate_.get()) |
| 475 user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate()); | 476 user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate()); |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 792 } | 793 } |
| 793 | 794 |
| 794 void Shell::ShowCursor(bool visible) { | 795 void Shell::ShowCursor(bool visible) { |
| 795 RootWindowList root_windows = GetAllRootWindows(); | 796 RootWindowList root_windows = GetAllRootWindows(); |
| 796 for (RootWindowList::iterator iter = root_windows.begin(); | 797 for (RootWindowList::iterator iter = root_windows.begin(); |
| 797 iter != root_windows.end(); ++iter) | 798 iter != root_windows.end(); ++iter) |
| 798 (*iter)->ShowCursor(visible); | 799 (*iter)->ShowCursor(visible); |
| 799 } | 800 } |
| 800 | 801 |
| 801 } // namespace ash | 802 } // namespace ash |
| OLD | NEW |