Update display::Display::kInvalidDisplayID constant.

chrome/browser/ui/ash/chrome_launcher_prefs.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/ash/chrome_launcher_prefs.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/sync/model/string_ordinal.h"
 #include "components/sync_preferences/pref_service_syncable.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
+#include "ui/display/types/display_constants.h"
 
 namespace ash {
 namespace launcher {
 
 namespace {
 
 // App ID of default pinned apps.
 const char* kDefaultPinnedApps[] = {
     extension_misc::kGmailAppId, extension_misc::kGoogleDocAppId,
     extension_misc::kYoutubeAppId, ArcSupportHost::kHostAppId};
@@ skipping 293 matching lines @@
 
 std::unique_ptr<base::DictionaryValue> CreateAppDict(
     const AppLauncherId& app_launcher_id) {
   auto app_value = base::MakeUnique<base::DictionaryValue>();
   app_value->SetString(kPinnedAppsPrefAppIDPath, app_launcher_id.ToString());
   return app_value;
 }
 
 ShelfAutoHideBehavior GetShelfAutoHideBehaviorPref(PrefService* prefs,
                                                    int64_t display_id) {
-  DCHECK_NE(display_id, display::Display::kInvalidDisplayID);
+  DCHECK_NE(display_id, display::kInvalidDisplayId);
 
   // Don't show the shelf in app mode.
   if (chrome::IsRunningInAppMode())
     return SHELF_AUTO_HIDE_ALWAYS_HIDDEN;
 
   // See comment in |kShelfAlignment| as to why we consider two prefs.
   return AutoHideBehaviorFromPref(
       GetPerDisplayPref(prefs, display_id, prefs::kShelfAutoHideBehaviorLocal,
                         prefs::kShelfAutoHideBehavior));
 }
 
 void SetShelfAutoHideBehaviorPref(PrefService* prefs,
                                   int64_t display_id,
                                   ShelfAutoHideBehavior behavior) {
-  DCHECK_NE(display_id, display::Display::kInvalidDisplayID);
+  DCHECK_NE(display_id, display::kInvalidDisplayId);
 
   const char* value = AutoHideBehaviorToPref(behavior);
   if (!value)
     return;
 
   SetPerDisplayPref(prefs, display_id, prefs::kShelfAutoHideBehavior, value);
   if (display_id == display::Screen::GetScreen()->GetPrimaryDisplay().id()) {
     // See comment in |kShelfAlignment| about why we have two prefs here.
     prefs->SetString(prefs::kShelfAutoHideBehaviorLocal, value);
     prefs->SetString(prefs::kShelfAutoHideBehavior, value);
   }
 }
 
 ShelfAlignment GetShelfAlignmentPref(PrefService* prefs, int64_t display_id) {
-  DCHECK_NE(display_id, display::Display::kInvalidDisplayID);
+  DCHECK_NE(display_id, display::kInvalidDisplayId);
 
   // See comment in |kShelfAlignment| as to why we consider two prefs.
   return AlignmentFromPref(GetPerDisplayPref(
       prefs, display_id, prefs::kShelfAlignmentLocal, prefs::kShelfAlignment));
 }
 
 void SetShelfAlignmentPref(PrefService* prefs,
                            int64_t display_id,
                            ShelfAlignment alignment) {
-  DCHECK_NE(display_id, display::Display::kInvalidDisplayID);
+  DCHECK_NE(display_id, display::kInvalidDisplayId);
 
   const char* value = AlignmentToPref(alignment);
   if (!value)
     return;
 
   SetPerDisplayPref(prefs, display_id, prefs::kShelfAlignment, value);
   if (display_id == display::Screen::GetScreen()->GetPrimaryDisplay().id()) {
     // See comment in |kShelfAlignment| as to why we consider two prefs.
     prefs->SetString(prefs::kShelfAlignmentLocal, value);
     prefs->SetString(prefs::kShelfAlignment, value);
@@ skipping 343 matching lines @@
     pin_position = position_before.CreateAfter();
   else if (position_after.IsValid())
     pin_position = position_after.CreateBefore();
   else
     pin_position = syncer::StringOrdinal::CreateInitialOrdinal();
   app_service->SetPinPosition(app_launcher_id_str, pin_position);
 }
 
 }  // namespace launcher
 }  // namespace ash