Rename Start/Stop in OutputConfigurator to better reflect their intent

BUG=

Review URL: https://codereview.chromium.org/181483004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254180 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 4 deletions

diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index 111394d..d201c96 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -180,7 +180,7 @@ void DisplayChangeObserver::OnAppTerminating() {
 #if defined(USE_ASH)
   // Stop handling display configuration events once the shutdown
   // process starts. crbug.com/177014.
-  Shell::GetInstance()->output_configurator()->Stop();
+  Shell::GetInstance()->output_configurator()->PrepareForExit();
 #endif
 }
 
diff --git a/ash/shell.cc b/ash/shell.cc
index 36357d0..8ed71fe 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -604,8 +604,6 @@ Shell::Shell(ShellDelegate* delegate)
   display_manager_.reset(new internal::DisplayManager);
   display_controller_.reset(new DisplayController);
 #if defined(OS_CHROMEOS) && defined(USE_X11)
-  // TODO: Move this initialization into Shell::Init().
-  output_configurator_->Init(!gpu_support_->IsPanelFittingDisabled());
   user_metrics_recorder_.reset(new UserMetricsRecorder);
 #endif  // defined(OS_CHROMEOS)
 
@@ -766,6 +764,7 @@ void Shell::Init() {
   }
   bool display_initialized = display_manager_->InitFromCommandLine();
 #if defined(OS_CHROMEOS) && defined(USE_X11)
+  output_configurator_->Init(!gpu_support_->IsPanelFittingDisabled());
   output_configurator_animation_.reset(
       new internal::OutputConfiguratorAnimation());
   output_configurator_->AddObserver(output_configurator_animation_.get());
@@ -782,7 +781,7 @@ void Shell::Init() {
     output_configurator_->AddObserver(display_error_observer_.get());
     output_configurator_->set_state_controller(display_change_observer_.get());
     output_configurator_->set_mirroring_controller(display_manager_.get());
-    output_configurator_->Start(
+    output_configurator_->ForceInitialConfigure(
         delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0);
     display_initialized = true;
   }