Cleanup: adopt C++11 range-based-for to simplify the code.

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_configurator_animation.h"
 #include "ash/display/display_controller.h"
@@ skipping 246 matching lines @@
   SendDisplayInfo(displays);
 }
 
 void DisplayOptionsHandler::SendDisplayInfo(
     const std::vector<gfx::Display>& displays) {
   DisplayManager* display_manager = GetDisplayManager();
   base::FundamentalValue mirroring(display_manager->IsMirrored());
 
   int64 primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id();
   base::ListValue js_displays;
-  for (size_t i = 0; i < displays.size(); ++i) {
-    const gfx::Display& display = displays[i];
+  for (const gfx::Display& display : displays) {
     const ash::DisplayInfo& display_info =
         display_manager->GetDisplayInfo(display.id());
     const gfx::Rect& bounds = display.bounds();
     base::DictionaryValue* js_display = new base::DictionaryValue();
     js_display->SetString("id", base::Int64ToString(display.id()));
     js_display->SetInteger("x", bounds.x());
     js_display->SetInteger("y", bounds.y());
     js_display->SetInteger("width", bounds.width());
     js_display->SetInteger("height", bounds.height());
     js_display->SetString("name",
                           display_manager->GetDisplayNameForId(display.id()));
     js_display->SetBoolean("isPrimary", display.id() == primary_id);
     js_display->SetBoolean("isInternal", display.IsInternal());
     js_display->SetInteger("orientation",
                            static_cast<int>(display_info.rotation()));
 
     base::ListValue* js_resolutions = new base::ListValue();
     const std::vector<ash::DisplayMode>& display_modes =
         display_info.display_modes();
-    for (size_t i = 0; i < display_modes.size(); ++i) {
+    for (const auto& display_mode : display_modes) {

[oshima, 2014/12/10 01:37:26]

nit: ash::DisplayMode

[Jun Mukai, 2014/12/10 01:39:48]

Done.

       js_resolutions->Append(
-          ConvertDisplayModeToValue(display.id(), display_modes[i]));
+          ConvertDisplayModeToValue(display.id(), display_mode));
     }
     js_display->Set("resolutions", js_resolutions);
 
     js_display->SetInteger("colorProfile", display_info.color_profile());
     base::ListValue* available_color_profiles = new base::ListValue();
-    for (size_t i = 0;
-         i < display_info.available_color_profiles().size(); ++i) {
-      ui::ColorCalibrationProfile color_profile =
-          display_info.available_color_profiles()[i];
+    for (const auto& color_profile : display_info.available_color_profiles()) {
       const base::string16 profile_name = GetColorProfileName(color_profile);
       if (profile_name.empty())
         continue;
       base::DictionaryValue* color_profile_dict = new base::DictionaryValue();
       color_profile_dict->SetInteger("profileId", color_profile);
       color_profile_dict->SetString("name", profile_name);
       available_color_profiles->Append(color_profile_dict);
     }
     js_display->Set("availableColorProfiles", available_color_profiles);
     js_displays.Append(js_display);
@@ skipping 74 matching lines @@
           static_cast<int>(offset)));
 }
 
 void DisplayOptionsHandler::HandleSetDisplayMode(const base::ListValue* args) {
   DCHECK(!args->empty());
 
   int64 display_id = GetDisplayId(args);
   if (display_id == gfx::Display::kInvalidDisplayID)
     return;
 
-  const base::DictionaryValue* mode_data = NULL;
+  const base::DictionaryValue* mode_data = nullptr;
   if (!args->GetDictionary(1, &mode_data)) {
     LOG(ERROR) << "Failed to get mode data";
     return;
   }
 
   ash::DisplayMode mode;
   if (!ConvertValueToDisplayMode(mode_data, &mode))
     return;
 
   content::RecordAction(
@@ skipping 59 matching lines @@
     return;
   }
 
   GetDisplayManager()->SetColorCalibrationProfile(
       display_id, static_cast<ui::ColorCalibrationProfile>(profile_id));
   SendAllDisplayInfo();
 }
 
 }  // namespace options
 }  // namespace chromeos