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

Unified Diff: ash/display/display_change_observer_chromeos.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « ash/display/cursor_window_controller.cc ('k') | ash/display/display_error_observer_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_chromeos.cc
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index 7630e6eb4c58cab5567eec8b23eb17d4655f922c..a6521ef99618ca4b8af18694b89e59062c76abb2 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -47,9 +47,9 @@ struct DeviceScaleFactorDPIThreshold {
};
const DeviceScaleFactorDPIThreshold kThresholdTable[] = {
- {200.0f, 2.0f},
- {150.0f, 1.25f},
- {0.0f, 1.0f},
+ {200.0f, 2.0f},
+ {150.0f, 1.25f},
+ {0.0f, 1.0f},
};
// 1 inch in mm.
@@ -82,8 +82,7 @@ std::vector<DisplayMode> DisplayChangeObserver::GetInternalDisplayModeList(
const ui::DisplayMode* ui_native_mode = output.native_mode();
DisplayMode native_mode(ui_native_mode->size(),
ui_native_mode->refresh_rate(),
- ui_native_mode->is_interlaced(),
- true);
+ ui_native_mode->is_interlaced(), true);
native_mode.device_scale_factor = display_info.device_scale_factor();
return CreateInternalDisplayModeList(native_mode);
@@ -131,8 +130,7 @@ std::vector<DisplayMode> DisplayChangeObserver::GetExternalDisplayModeList(
}
if (native_mode.size.width() >= kMinimumWidthFor4K) {
- for (size_t i = 0; i < arraysize(kAdditionalDeviceScaleFactorsFor4k);
- ++i) {
+ for (size_t i = 0; i < arraysize(kAdditionalDeviceScaleFactorsFor4k); ++i) {
DisplayMode mode = native_mode;
mode.device_scale_factor = kAdditionalDeviceScaleFactorsFor4k[i];
mode.native = false;
@@ -168,15 +166,15 @@ ui::MultipleDisplayState DisplayChangeObserver::GetStateForDisplayIds(
->display_manager()
->layout_store()
->GetRegisteredDisplayLayout(list);
- return layout.mirrored ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR :
- ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
+ return layout.mirrored ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR
+ : ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
}
bool DisplayChangeObserver::GetResolutionForDisplayId(int64_t display_id,
gfx::Size* size) const {
DisplayMode mode;
if (!Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId(
- display_id, &mode))
+ display_id, &mode))
return false;
*size = mode.size;
« no previous file with comments | « ash/display/cursor_window_controller.cc ('k') | ash/display/display_error_observer_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698