Update display::Display::kInvalidDisplayID constant.

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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 16 matching lines @@
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/display_layout_builder.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
+#include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace chromeos {
 namespace options {
 namespace {
 
 display::DisplayManager* GetDisplayManager() {
   return ash::Shell::GetInstance()->display_manager();
 }
 
 ash::DisplayConfigurationController* GetDisplayConfigurationController() {
   return ash::Shell::GetInstance()->display_configuration_controller();
 }
 
 int64_t GetDisplayIdFromValue(const base::Value* arg) {
   std::string id_value;
   if (!arg->GetAsString(&id_value))
-    return display::Display::kInvalidDisplayID;
-  int64_t display_id = display::Display::kInvalidDisplayID;
+    return display::kInvalidDisplayId;
+  int64_t display_id = display::kInvalidDisplayId;
   if (!base::StringToInt64(id_value, &display_id))
-    return display::Display::kInvalidDisplayID;
+    return display::kInvalidDisplayId;
   return display_id;
 }
 
 int64_t GetDisplayIdFromArgs(const base::ListValue* args) {
   const base::Value* arg;
   if (!args->Get(0, &arg)) {
     LOG(ERROR) << "No display id arg";
-    return display::Display::kInvalidDisplayID;
+    return display::kInvalidDisplayId;
   }
   int64_t display_id = GetDisplayIdFromValue(arg);
-  if (display_id == display::Display::kInvalidDisplayID)
+  if (display_id == display::kInvalidDisplayId)
     LOG(ERROR) << "Invalid display id: " << *arg;
   return display_id;
 }
 
 int64_t GetDisplayIdFromDictionary(const base::DictionaryValue* dictionary,
                                    const std::string& key) {
   const base::Value* arg;
   if (!dictionary->Get(key, &arg))
-    return display::Display::kInvalidDisplayID;
+    return display::kInvalidDisplayId;
   return GetDisplayIdFromValue(arg);
 }
 
 base::string16 GetColorProfileName(ui::ColorCalibrationProfile profile) {
   switch (profile) {
     case ui::COLOR_PROFILE_STANDARD:
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_STANDARD);
     case ui::COLOR_PROFILE_DYNAMIC:
       return l10n_util::GetStringUTF16(
@@ skipping 264 matching lines @@
       color_profile_dict->SetInteger("profileId", color_profile);
       color_profile_dict->SetString("name", profile_name);
       available_color_profiles->Append(std::move(color_profile_dict));
     }
     js_display->Set("availableColorProfiles", available_color_profiles);
 
     if (display_manager->GetNumDisplays() > 1) {
       const display::DisplayPlacement placement =
           display_manager->GetCurrentDisplayLayout().FindPlacementById(
               display.id());
-      if (placement.display_id != display::Display::kInvalidDisplayID) {
+      if (placement.display_id != display::kInvalidDisplayId) {
         js_display->SetString(
             "parentId", base::Int64ToString(placement.parent_display_id));
         js_display->SetInteger("layoutType", placement.position);
         js_display->SetInteger("offset", placement.offset);
       }
     }
 
     js_displays->Append(std::move(js_display));
   }
 
@@ skipping 34 matching lines @@
     NOTREACHED();
   content::RecordAction(
       base::UserMetricsAction("Options_DisplayToggleMirroring"));
   GetDisplayConfigurationController()->SetMirrorMode(is_mirroring,
                                                      true /* user_action */);
 }
 
 void DisplayOptionsHandler::HandleSetPrimary(const base::ListValue* args) {
   DCHECK(!args->empty());
   int64_t display_id = GetDisplayIdFromArgs(args);
-  if (display_id == display::Display::kInvalidDisplayID)
+  if (display_id == display::kInvalidDisplayId)
     return;
 
   content::RecordAction(base::UserMetricsAction("Options_DisplaySetPrimary"));
   GetDisplayConfigurationController()->SetPrimaryDisplayId(
       display_id, true /* user_action */);
 }
 
 void DisplayOptionsHandler::HandleSetDisplayLayout(
     const base::ListValue* args) {
   const base::ListValue* layouts = nullptr;
   if (!args->GetList(0, &layouts))
     NOTREACHED();
   content::RecordAction(base::UserMetricsAction("Options_DisplayRearrange"));
 
   display::DisplayManager* display_manager = GetDisplayManager();
   display::DisplayLayoutBuilder builder(
       display_manager->GetCurrentDisplayLayout());
   builder.ClearPlacements();
   for (const auto& layout : *layouts) {
     const base::DictionaryValue* dictionary;
     if (!layout->GetAsDictionary(&dictionary)) {
       LOG(ERROR) << "Invalid layout dictionary: " << *dictionary;
       continue;
     }
 
     int64_t parent_id = GetDisplayIdFromDictionary(dictionary, "parentId");
-    if (parent_id == display::Display::kInvalidDisplayID)
+    if (parent_id == display::kInvalidDisplayId)
       continue;  // No placement for root (primary) display.
 
     int64_t display_id = GetDisplayIdFromDictionary(dictionary, "id");
-    if (display_id == display::Display::kInvalidDisplayID) {
+    if (display_id == display::kInvalidDisplayId) {
       LOG(ERROR) << "Invalud display id in layout dictionary: " << *dictionary;
       continue;
     }
 
     int position = 0;
     dictionary->GetInteger("layoutType", &position);
     int offset = 0;
     dictionary->GetInteger("offset", &offset);
 
     builder.AddDisplayPlacement(
         display_id, parent_id,
         static_cast<display::DisplayPlacement::Position>(position), offset);
   }
   std::unique_ptr<display::DisplayLayout> layout = builder.Build();
   if (!display::DisplayLayout::Validate(
           display_manager->GetCurrentDisplayIdList(), *layout)) {
     LOG(ERROR) << "Invalid layout: " << layout->ToString();
     return;
   }
 
   VLOG(1) << "Updating display layout: " << layout->ToString();
   GetDisplayConfigurationController()->SetDisplayLayout(std::move(layout),
                                                         true /* user_action */);
 }
 
 void DisplayOptionsHandler::HandleSetDisplayMode(const base::ListValue* args) {
   DCHECK(!args->empty());
 
   int64_t display_id = GetDisplayIdFromArgs(args);
-  if (display_id == display::Display::kInvalidDisplayID)
+  if (display_id == display::kInvalidDisplayId)
     return;
 
   const base::DictionaryValue* mode_data = nullptr;
   if (!args->GetDictionary(1, &mode_data)) {
     LOG(ERROR) << "Failed to get mode data";
     return;
   }
 
   scoped_refptr<display::ManagedDisplayMode> mode =
       ConvertValueToManagedDisplayMode(mode_data);
@@ skipping 17 matching lines @@
   ash::Shell::GetInstance()
       ->resolution_notification_controller()
       ->PrepareNotification(display_id, current_mode, mode,
                             base::Bind(&chromeos::StoreDisplayPrefs));
 }
 
 void DisplayOptionsHandler::HandleSetRotation(const base::ListValue* args) {
   DCHECK(!args->empty());
 
   int64_t display_id = GetDisplayIdFromArgs(args);
-  if (display_id == display::Display::kInvalidDisplayID)
+  if (display_id == display::kInvalidDisplayId)
     return;
 
   int rotation_value = 0;
   if (!args->GetInteger(1, &rotation_value)) {
     LOG(ERROR) << "Can't parse rotation: " << args;
     return;
   }
   display::Display::Rotation new_rotation = display::Display::ROTATE_0;
   if (rotation_value == 90)
     new_rotation = display::Display::ROTATE_90;
   else if (rotation_value == 180)
     new_rotation = display::Display::ROTATE_180;
   else if (rotation_value == 270)
     new_rotation = display::Display::ROTATE_270;
   else if (rotation_value != 0)
     LOG(ERROR) << "Invalid rotation: " << rotation_value << " Falls back to 0";
 
   content::RecordAction(
       base::UserMetricsAction("Options_DisplaySetOrientation"));
   GetDisplayConfigurationController()->SetDisplayRotation(
       display_id, new_rotation, display::Display::ROTATION_SOURCE_USER,
       true /* user_action */);
 }
 
 void DisplayOptionsHandler::HandleSetColorProfile(const base::ListValue* args) {
   DCHECK(!args->empty());
   int64_t display_id = GetDisplayIdFromArgs(args);
-  if (display_id == display::Display::kInvalidDisplayID)
+  if (display_id == display::kInvalidDisplayId)
     return;
 
   std::string profile_value;
   if (!args->GetString(1, &profile_value)) {
     LOG(ERROR) << "Invalid profile_value";
     return;
   }
 
   int profile_id;
   if (!base::StringToInt(profile_value, &profile_id)) {
@@ skipping 22 matching lines @@
   if (!args->GetBoolean(0, &enable))
     NOTREACHED();
 
   GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays(
       enable ? display::DisplayManager::UNIFIED
              : display::DisplayManager::EXTENDED);
 }
 
 }  // namespace options
 }  // namespace chromeos