Move kInvalidDisplayID to display_constants.h.

ui/message_center/views/desktop_popup_alignment_delegate.cc

 // Copyright 2014 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 "ui/message_center/views/desktop_popup_alignment_delegate.h"
 
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/views/message_popup_collection.h"
 
 namespace message_center {
 
 DesktopPopupAlignmentDelegate::DesktopPopupAlignmentDelegate()
     : alignment_(POPUP_ALIGNMENT_BOTTOM | POPUP_ALIGNMENT_RIGHT),
-      primary_display_id_(display::Display::kInvalidDisplayID),
+      primary_display_id_(display::kInvalidDisplayId),
       screen_(NULL) {}
 
 DesktopPopupAlignmentDelegate::~DesktopPopupAlignmentDelegate() {
   if (screen_)
     screen_->RemoveObserver(this);
 }
 
 void DesktopPopupAlignmentDelegate::StartObserving(display::Screen* screen) {
   if (screen_ || !screen)
     return;
@@ skipping 84 matching lines @@
 
 void DesktopPopupAlignmentDelegate::OnDisplayRemoved(
     const display::Display& removed_display) {
   // The removed display may have been the primary display.
   UpdatePrimaryDisplay();
 }
 
 void DesktopPopupAlignmentDelegate::OnDisplayMetricsChanged(
     const display::Display& display,
     uint32_t metrics) {
-  // Set to kInvalidDisplayID so the alignment is updated regardless of whether
+  // Set to kInvalidDisplayId so the alignment is updated regardless of whether
   // the primary display actually changed.
-  primary_display_id_ = display::Display::kInvalidDisplayID;
+  primary_display_id_ = display::kInvalidDisplayId;
   UpdatePrimaryDisplay();
 }
 
 }  // namespace message_center