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

Unified Diff: ui/display/manager/display_manager_utilities_unittest.cc

Issue 2519993002: Move kInvalidDisplayID to display_constants.h. (Closed)
Patch Set: Address comments. 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 | « ui/display/manager/display_manager.cc ('k') | ui/display/manager/managed_display_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/manager/display_manager_utilities_unittest.cc
diff --git a/ui/display/manager/display_manager_utilities_unittest.cc b/ui/display/manager/display_manager_utilities_unittest.cc
index b82871b141c07499334bd7e7a4af764235650b4a..9f5d9af395f7c85eaf3d2045b6e39543cacfd957 100644
--- a/ui/display/manager/display_manager_utilities_unittest.cc
+++ b/ui/display/manager/display_manager_utilities_unittest.cc
@@ -2,21 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// #include "ash/display/display_util.h"
-
#include "ui/display/manager/display_manager_utilities.h"
#include "testing/gtest/include/gtest/gtest.h"
-
-//#include "ash/root_window_controller.h"
-//#include "ash/shell.h"
-//#include "ash/test/ash_test_base.h"
-//#include "ash/test/display_manager_test_api.h"
+#include "ui/display/display.h"
+#include "ui/display/types/display_constants.h"
namespace display {
-// typedef test::AshTestBase DisplayUtilTest;
-
namespace {
class ScopedSetInternalDisplayId {
@@ -30,7 +23,7 @@ ScopedSetInternalDisplayId::ScopedSetInternalDisplayId(int64_t id) {
}
ScopedSetInternalDisplayId::~ScopedSetInternalDisplayId() {
- display::Display::SetInternalDisplayId(display::Display::kInvalidDisplayID);
+ display::Display::SetInternalDisplayId(kInvalidDisplayId);
}
} // namespace
« no previous file with comments | « ui/display/manager/display_manager.cc ('k') | ui/display/manager/managed_display_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698