chromeos: output_configurator: various style fixes

chrome/browser/ui/webui/options2/chromeos/display_options_handler.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 "chrome/browser/ui/webui/options2/chromeos/display_options_handler.h"
 
 #include <string>
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
@@ skipping 68 matching lines @@
 }
 
 void DisplayOptionsHandler::OnDisplayRemoved(const gfx::Display& old_display) {
   UpdateDisplaySectionVisibility();
   SendDisplayInfo();
 }
 
 void DisplayOptionsHandler::UpdateDisplaySectionVisibility() {
   aura::DisplayManager* display_manager =
       aura::Env::GetInstance()->display_manager();
-  chromeos::State output_state =
+  chromeos::OutputState output_state =
       ash::Shell::GetInstance()->output_configurator()->output_state();
   base::FundamentalValue show_options(
       DisplayController::IsExtendedDesktopEnabled() &&
       display_manager->GetNumDisplays() > 1 &&
       output_state != chromeos::STATE_INVALID &&
       output_state != chromeos::STATE_HEADLESS &&
       output_state != chromeos::STATE_SINGLE);
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.showDisplayOptions", show_options);
 }
@@ skipping 32 matching lines @@
     const base::ListValue* unused_args) {
   SendDisplayInfo();
 }
 
 void DisplayOptionsHandler::HandleMirroring(const base::ListValue* args) {
   DCHECK(!args->empty());
   bool is_mirroring = false;
   args->GetBoolean(0, &is_mirroring);
   // We use 'PRIMARY_ONLY' for non-mirroring state for now.
   // TODO(mukai): fix this and support multiple display modes.
-  chromeos::State new_state =
+  chromeos::OutputState new_state =
       is_mirroring ? STATE_DUAL_MIRROR : STATE_DUAL_PRIMARY_ONLY;
   ash::Shell::GetInstance()->output_configurator()->SetDisplayMode(new_state);
   SendDisplayInfo();
 }
 
 void DisplayOptionsHandler::HandleDisplayLayout(const base::ListValue* args) {
   double layout = -1;
   if (!args->GetDouble(0, &layout)) {
     LOG(ERROR) << "Invalid parameter";
     return;
   }
   DCHECK_LE(DisplayController::TOP, layout);
   DCHECK_GE(DisplayController::LEFT, layout);
 
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   pref_service->SetInteger(prefs::kSecondaryDisplayLayout, layout);
   SendDisplayInfo();
 }
 
 }  // namespace options2
 }  // namespace chromeos