Allows to show display settings for 1-display of stumpy.

chrome/browser/ui/webui/options/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/options/chromeos/display_options_handler.h"
 
 #include <string>
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
@@ skipping 57 matching lines @@
   localized_strings->SetString(
       "finishCalibratingOverscan", l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_FINISH_CALIBRATING_OVERSCAN));
   localized_strings->SetString(
       "clearCalibratingOverscan", l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_CLEAR_CALIBRATING_OVERSCAN));
 }
 
 void DisplayOptionsHandler::InitializePage() {
   DCHECK(web_ui());
-  UpdateDisplaySectionVisibility(GetDisplayManager()->GetNumDisplays());
+  std::vector<const gfx::Display*> displays;
+  DisplayManager* display_manager = GetDisplayManager();
+  for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
+    displays.push_back(display_manager->GetDisplayAt(i));
+  }
+  UpdateDisplaySectionVisibility(displays);
 }
 
 void DisplayOptionsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "getDisplayInfo",
       base::Bind(&DisplayOptionsHandler::HandleDisplayInfo,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "setMirroring",
       base::Bind(&DisplayOptionsHandler::HandleMirroring,
@@ skipping 22 matching lines @@
       "updateOverscanCalibration",
       base::Bind(&DisplayOptionsHandler::HandleUpdateOverscanCalibration,
                  base::Unretained(this)));
 }
 
 void DisplayOptionsHandler::OnDisplayBoundsChanged(
     const gfx::Display& display) {
 }
 
 void DisplayOptionsHandler::OnDisplayAdded(const gfx::Display& new_display) {
-  UpdateDisplaySectionVisibility(GetDisplayManager()->GetNumDisplays());
+  std::vector<const gfx::Display*> displays;
+  DisplayManager* display_manager = GetDisplayManager();
+  for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
+    displays.push_back(display_manager->GetDisplayAt(i));
+  }
+  UpdateDisplaySectionVisibility(displays);
   SendAllDisplayInfo();
 }
 
 void DisplayOptionsHandler::OnDisplayRemoved(const gfx::Display& old_display) {
   DisplayManager* display_manager = GetDisplayManager();
-  UpdateDisplaySectionVisibility(display_manager->GetNumDisplays() - 1);
 
   std::vector<const gfx::Display*> displays;
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
     const gfx::Display* display = display_manager->GetDisplayAt(i);
     if (display->id() != old_display.id())
       displays.push_back(display);
   }
+  UpdateDisplaySectionVisibility(displays);
   SendDisplayInfo(displays);
 }
 
 void DisplayOptionsHandler::UpdateDisplaySectionVisibility(
-    size_t num_displays) {
+    const std::vector<const gfx::Display*>& displays) {
+  DisplayManager* display_manager = GetDisplayManager();
+  bool has_external = false;
+  for (size_t i = 0; i < displays.size(); i++) {
+    if (!display_manager->IsInternalDisplayId(displays[i]->id())) {
+      has_external = true;
+      break;
+    }
+  }

[oshima, 2013/01/31 02:32:40]

You should be able to tell if there is an external display by

has_external = !DisplayManager::HasInternalDisplay() || num_display > 1

and i think it'll make this CL smaller?

[Jun Mukai, 2013/01/31 02:40:10]

indeed. done.

+
   chromeos::OutputState output_state =
       ash::Shell::GetInstance()->output_configurator()->output_state();
   base::FundamentalValue show_options(
-      num_displays > 1 || output_state == chromeos::STATE_DUAL_MIRROR);
+      has_external || output_state == chromeos::STATE_DUAL_MIRROR);
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.showDisplayOptions", show_options);
 }
 
 void DisplayOptionsHandler::SendAllDisplayInfo() {
   DisplayManager* display_manager = GetDisplayManager();
 
   std::vector<const gfx::Display*> displays;
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
     displays.push_back(display_manager->GetDisplayAt(i));
@@ skipping 180 matching lines @@
       !args->GetDouble(2, &bottom) || !args->GetDouble(3, &right)) {
     LOG(ERROR) << "Can't find overscan insets data.";
     return;
   }
 
   overscan_calibrator_->UpdateInsets(gfx::Insets(top, left, bottom, right));
 }
 
 }  // namespace options
 }  // namespace chromeos