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

Unified Diff: chrome/browser/chromeos/policy/display_rotation_default_handler.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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
Index: chrome/browser/chromeos/policy/display_rotation_default_handler.cc
diff --git a/chrome/browser/chromeos/policy/display_rotation_default_handler.cc b/chrome/browser/chromeos/policy/display_rotation_default_handler.cc
index 03f72fb7526501447393863335788b1b82282553..a9e18c3ed9666f02fd9b716f29261ee7151b44a4 100644
--- a/chrome/browser/chromeos/policy/display_rotation_default_handler.cc
+++ b/chrome/browser/chromeos/policy/display_rotation_default_handler.cc
@@ -67,13 +67,14 @@ void DisplayRotationDefaultHandler::RotateDisplays() {
ash::Shell::GetInstance()->display_manager();
const size_t num_displays = display_manager->GetNumDisplays();
for (size_t i = 0; i < num_displays; ++i) {
- const gfx::Display& display = display_manager->GetDisplayAt(i);
+ const display::Display& display = display_manager->GetDisplayAt(i);
const int64_t id = display.id();
if (rotated_displays_.find(id) == rotated_displays_.end()) {
rotated_displays_.insert(id);
if (display.rotation() != display_rotation_default_) {
- display_manager->SetDisplayRotation(id, display_rotation_default_,
- gfx::Display::ROTATION_SOURCE_ACTIVE);
+ display_manager->SetDisplayRotation(
+ id, display_rotation_default_,
+ display::Display::ROTATION_SOURCE_ACTIVE);
}
}
}
@@ -84,12 +85,13 @@ bool DisplayRotationDefaultHandler::UpdateFromCrosSettings() {
int new_rotation;
bool new_policy_enabled = chromeos::CrosSettings::Get()->GetInteger(
chromeos::kDisplayRotationDefault, &new_rotation);
- gfx::Display::Rotation new_display_rotation_default = gfx::Display::ROTATE_0;
+ display::Display::Rotation new_display_rotation_default =
+ display::Display::ROTATE_0;
if (new_policy_enabled) {
- if (new_rotation >= gfx::Display::ROTATE_0 &&
- new_rotation <= gfx::Display::ROTATE_270) {
+ if (new_rotation >= display::Display::ROTATE_0 &&
+ new_rotation <= display::Display::ROTATE_270) {
new_display_rotation_default =
- static_cast<gfx::Display::Rotation>(new_rotation);
+ static_cast<display::Display::Rotation>(new_rotation);
} else {
LOG(ERROR) << "CrosSettings contains invalid value " << new_rotation
<< " for DisplayRotationDefault. Ignoring setting.";

Powered by Google App Engine
This is Rietveld 408576698