mash: Create and show a shelf in mash.

ash/common/wm_shell.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/ash_focus_manager_factory.h"
@@ skipping 72 matching lines @@
   // ShelfItemDelegate subclasses it owns have complex cleanup to run (e.g. ARC
   // shelf items in Chrome) so explicitly shutdown early.
   shelf_model_->DestroyItemDelegates();
   // Must be destroyed before FocusClient.
   shelf_delegate_.reset();
 
   // Balances the Install() in Initialize().
   views::FocusManagerFactory::Install(nullptr);
 }
 
+void WmShell::CreateShelfDelegate() {
+  // May be called multiple times as shelves are created and destroyed.
+  if (shelf_delegate_)
+    return;
+  // Must occur after SessionStateDelegate creation and user login because
+  // Chrome's implementation of ShelfDelegate assumes it can get information
+  // about multi-profile login state.
+  DCHECK(GetSessionStateDelegate());
+  DCHECK_GT(GetSessionStateDelegate()->NumberOfLoggedInUsers(), 0);
+  shelf_delegate_.reset(delegate_->CreateShelfDelegate(shelf_model_.get()));
+  shelf_window_watcher_.reset(new ShelfWindowWatcher(shelf_model_.get()));
+}
+
 void WmShell::OnMaximizeModeStarted() {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeStarted());
 }
 
 void WmShell::OnMaximizeModeEnded() {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeEnded());
 }
 
 void WmShell::NotifyFullscreenStateChanged(bool is_fullscreen,
                                            WmWindow* root_window) {
@@ skipping 138 matching lines @@
 }
 
 void WmShell::DeleteSystemTrayDelegate() {
   DCHECK(system_tray_delegate_);
 #if defined(OS_CHROMEOS)
   logout_confirmation_controller_.reset();
 #endif
   system_tray_delegate_.reset();
 }
 
-void WmShell::CreateShelfDelegate() {
-  // May be called multiple times as shelves are created and destroyed.
-  if (shelf_delegate_)
-    return;
-  // Must occur after SessionStateDelegate creation and user login because
-  // Chrome's implementation of ShelfDelegate assumes it can get information
-  // about multi-profile login state.
-  DCHECK(GetSessionStateDelegate());
-  DCHECK_GT(GetSessionStateDelegate()->NumberOfLoggedInUsers(), 0);
-  shelf_delegate_.reset(delegate_->CreateShelfDelegate(shelf_model_.get()));
-  shelf_window_watcher_.reset(new ShelfWindowWatcher(shelf_model_.get()));
-}
-
 void WmShell::DeleteWindowCycleController() {
   window_cycle_controller_.reset();
 }
 
 void WmShell::DeleteWindowSelectorController() {
   window_selector_controller_.reset();
 }
 
 void WmShell::CreateMaximizeModeController() {
   maximize_mode_controller_.reset(new MaximizeModeController);
@@ skipping 14 matching lines @@
 void WmShell::DeleteToastManager() {
   toast_manager_.reset();
 }
 
 void WmShell::SetAcceleratorController(
     std::unique_ptr<AcceleratorController> accelerator_controller) {
   accelerator_controller_ = std::move(accelerator_controller);
 }
 
 }  // namespace ash