Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Unified Diff: services/ui/display/platform_screen_ozone.cc

Issue 2523723002: Update display::Display::kInvalidDisplayID constant. (Closed)
Patch Set: Fix includes. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/display/platform_screen_ozone.h ('k') | services/ui/public/cpp/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/display/platform_screen_ozone.cc
diff --git a/services/ui/display/platform_screen_ozone.cc b/services/ui/display/platform_screen_ozone.cc
index 3a9433d18359257a14f0e81140c148a1920dd9c7..5d6eea13b6cf51bb15dc4494feaad4f45fb6bddd 100644
--- a/services/ui/display/platform_screen_ozone.cc
+++ b/services/ui/display/platform_screen_ozone.cc
@@ -13,7 +13,6 @@
#include "base/threading/thread_task_runner_handle.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "ui/display/types/display_constants.h"
#include "ui/display/types/display_snapshot.h"
#include "ui/display/types/native_display_delegate.h"
#include "ui/gfx/geometry/rect.h"
@@ -115,8 +114,7 @@ void PlatformScreenOzone::ToggleAddRemoveDisplay() {
if (cached_displays_.size() == 1) {
const gfx::Size& pixel_size = cached_displays_[0].metrics.pixel_size;
wait_for_display_config_update_ =
- fake_display_controller_->AddDisplay(pixel_size) !=
- Display::kInvalidDisplayID;
+ fake_display_controller_->AddDisplay(pixel_size) != kInvalidDisplayId;
} else if (cached_displays_.size() > 1) {
wait_for_display_config_update_ =
fake_display_controller_->RemoveDisplay(cached_displays_.back().id);
@@ -207,7 +205,7 @@ void PlatformScreenOzone::ProcessRemovedDisplays(
current_ids.end()) {
display.removed = true;
if (primary_display_id_ == display.id)
- primary_display_id_ = Display::kInvalidDisplayID;
+ primary_display_id_ = kInvalidDisplayId;
}
}
}
@@ -287,7 +285,7 @@ void PlatformScreenOzone::AddNewDisplays(
delegate_->OnDisplayAdded(display_info.id, display_info.metrics);
// If we have no primary display then this one should be it.
- if (primary_display_id_ == Display::kInvalidDisplayID) {
+ if (primary_display_id_ == kInvalidDisplayId) {
primary_display_id_ = id;
delegate_->OnPrimaryDisplayChanged(primary_display_id_);
}
@@ -328,7 +326,7 @@ void PlatformScreenOzone::OnDisplayModeChanged(
// If the primary display is marked as removed we'll try to find a new primary
// display and update the delegate before removing the old primary display.
- if (primary_display_id_ == Display::kInvalidDisplayID) {
+ if (primary_display_id_ == kInvalidDisplayId) {
for (const DisplayInfo& display : cached_displays_) {
if (!display.removed) {
primary_display_id_ = display.id;
« no previous file with comments | « services/ui/display/platform_screen_ozone.h ('k') | services/ui/public/cpp/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698