| Index: ui/display/test/display_manager_test_api.cc
|
| diff --git a/ui/display/test/display_manager_test_api.cc b/ui/display/test/display_manager_test_api.cc
|
| index 5e207a4e388601d9d45c8ac149ce78aae054feb5..94bade592ac019215e689128c5c6bf246b72ea33 100644
|
| --- a/ui/display/test/display_manager_test_api.cc
|
| +++ b/ui/display/test/display_manager_test_api.cc
|
| @@ -34,8 +34,7 @@ DisplayInfoList CreateDisplayInfoListFromString(
|
|
|
| for (std::vector<std::string>::const_iterator iter = parts.begin();
|
| iter != parts.end(); ++iter, ++index) {
|
| - int64_t id = (index < list.size()) ? list[index].id()
|
| - : display::Display::kInvalidDisplayID;
|
| + int64_t id = (index < list.size()) ? list[index].id() : kInvalidDisplayId;
|
| display_info_list.push_back(
|
| display::ManagedDisplayInfo::CreateFromSpecWithID(*iter, id));
|
| }
|
| @@ -156,7 +155,7 @@ ScopedSetInternalDisplayId::ScopedSetInternalDisplayId(
|
| }
|
|
|
| ScopedSetInternalDisplayId::~ScopedSetInternalDisplayId() {
|
| - display::Display::SetInternalDisplayId(display::Display::kInvalidDisplayID);
|
| + display::Display::SetInternalDisplayId(kInvalidDisplayId);
|
| }
|
|
|
| bool SetDisplayResolution(DisplayManager* display_manager,
|
|
|