Remove ash::ShellDelegate::IsFirstRunAfterBoot method

ash/root_window_controller.cc

 // Copyright (c) 2012 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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/aura/aura_layout_manager_adapter.h"
@@ skipping 64 matching lines @@
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/visibility_controller.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/drag_drop_client.h"
 #include "ui/wm/public/tooltip_client.h"
 #include "ui/wm/public/window_types.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/ash_touch_exploration_manager_chromeos.h"
 #include "ash/wm/boot_splash_screen_chromeos.h"
+#include "chromeos/chromeos_switches.h"
 #include "ui/chromeos/touch_exploration_controller.h"
 #endif
 
 namespace ash {
 namespace {
 
 #if defined(OS_CHROMEOS)
 // Duration for the animation that hides the boot splash screen, in
 // milliseconds.  This should be short enough in relation to
 // wm/window_animation.cc's brightness/grayscale fade animation that the login
@@ skipping 45 matching lines @@
     return std::find(blocking_iter, windows.end(), target) != windows.end();
   }
 
   return true;
 }
 
 }  // namespace
 
 void RootWindowController::CreateForPrimaryDisplay(AshWindowTreeHost* host) {
   RootWindowController* controller = new RootWindowController(host);
-  controller->Init(RootWindowController::PRIMARY,
-                   WmShell::Get()->delegate()->IsFirstRunAfterBoot());
+  controller->Init(RootWindowController::PRIMARY);
 }
 
 void RootWindowController::CreateForSecondaryDisplay(AshWindowTreeHost* host) {
   RootWindowController* controller = new RootWindowController(host);
-  controller->Init(RootWindowController::SECONDARY, false /* first run */);
+  controller->Init(RootWindowController::SECONDARY);
 }
 
 // static
 RootWindowController* RootWindowController::ForWindow(
     const aura::Window* window) {
   CHECK(Shell::HasInstance());
   return GetRootWindowController(window->GetRootWindow());
 }
 
 // static
@@ skipping 249 matching lines @@
 
   // Has to happen after this is set as |controller| of RootWindowSettings.
   wm_root_window_controller_ = WmRootWindowControllerAura::Get(root_window);
 
   stacking_controller_.reset(new StackingController);
   aura::client::SetWindowParentingClient(root_window,
                                          stacking_controller_.get());
   capture_client_.reset(new ::wm::ScopedCaptureClient(root_window));
 }
 
-void RootWindowController::Init(RootWindowType root_window_type,
-                                bool first_run_after_boot) {
+void RootWindowController::Init(RootWindowType root_window_type) {
   aura::Window* root_window = GetRootWindow();
   Shell* shell = Shell::GetInstance();
   shell->InitRootWindow(root_window);
 
   wm_root_window_controller_->CreateContainers();
 
-  CreateSystemWallpaper(first_run_after_boot);
+  CreateSystemWallpaper(root_window_type);
 
   InitLayoutManagers();
   InitTouchHuds();
 
   if (WmShell::Get()
           ->GetPrimaryRootWindowController()
           ->GetSystemModalLayoutManager(nullptr)
           ->has_window_dimmer()) {
     wm_root_window_controller_->GetSystemModalLayoutManager(nullptr)
         ->CreateModalBackground();
@@ skipping 58 matching lines @@
 }
 
 void RootWindowController::InitTouchHuds() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kAshTouchHud))
     set_touch_hud_debug(new TouchHudDebug(GetRootWindow()));
   if (Shell::GetInstance()->is_touch_hud_projection_enabled())
     EnableTouchHudProjection();
 }
 
-void RootWindowController::CreateSystemWallpaper(bool is_first_run_after_boot) {
+void RootWindowController::CreateSystemWallpaper(
+    RootWindowType root_window_type) {
   SkColor color = SK_ColorBLACK;
 #if defined(OS_CHROMEOS)
-  if (is_first_run_after_boot)
+  // The splash screen appears on the primary display at boot. If this is a
+  // secondary monitor (either connected at boot or connected later) or if the
+  // browser restarted for a second login then don't use the boot color.
+  const bool is_boot_splash_screen =
+      root_window_type == PRIMARY &&
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kFirstExecAfterBoot);
+  if (is_boot_splash_screen)
     color = kChromeOsBootColor;
 #endif
   system_wallpaper_.reset(
       new SystemWallpaperController(GetRootWindow(), color));
 
 #if defined(OS_CHROMEOS)
   // Make a copy of the system's boot splash screen so we can composite it
   // onscreen until the wallpaper is ready.
-  if (is_first_run_after_boot &&
+  if (is_boot_splash_screen &&
       (base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kAshCopyHostBackgroundAtBoot) ||
        base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kAshAnimateFromBootSplashScreen)))
     boot_splash_screen_.reset(new BootSplashScreen(GetHost()));
 #endif
 }
 
 void RootWindowController::EnableTouchHudProjection() {
   if (touch_hud_projection_)
@@ skipping 25 matching lines @@
     EnableTouchHudProjection();
   else
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : nullptr;
 }
 
 }  // namespace ash