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

Unified Diff: ash/magnifier/partial_magnification_controller.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
Index: ash/magnifier/partial_magnification_controller.cc
diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc
index a3837666e61ccf521696184d5a75778677f76337..3e609791502fcff24e672f31babdee393ec15da9 100644
--- a/ash/magnifier/partial_magnification_controller.cc
+++ b/ash/magnifier/partial_magnification_controller.cc
@@ -94,8 +94,7 @@ void PartialMagnificationController::OnMouseEvent(ui::MouseEvent* event) {
////////////////////////////////////////////////////////////////////////////////
// PartialMagnificationController: aura::WindowObserver implementation
-void PartialMagnificationController::OnWindowDestroying(
- aura::Window* window) {
+void PartialMagnificationController::OnWindowDestroying(aura::Window* window) {
CloseMagnifierWindow();
aura::Window* new_root_window = GetCurrentRootWindow();
@@ -103,8 +102,7 @@ void PartialMagnificationController::OnWindowDestroying(
SwitchTargetRootWindow(new_root_window);
}
-void PartialMagnificationController::OnWidgetDestroying(
- views::Widget* widget) {
+void PartialMagnificationController::OnWidgetDestroying(views::Widget* widget) {
DCHECK_EQ(widget, zoom_widget_);
RemoveZoomWidgetObservers();
zoom_widget_ = NULL;
@@ -117,8 +115,8 @@ void PartialMagnificationController::OnMouseMove(
origin.Offset(-kMagnifierWidth / 2, -kMagnifierHeight / 2);
if (zoom_widget_) {
- zoom_widget_->SetBounds(gfx::Rect(origin.x(), origin.y(),
- kMagnifierWidth, kMagnifierHeight));
+ zoom_widget_->SetBounds(
+ gfx::Rect(origin.x(), origin.y(), kMagnifierWidth, kMagnifierHeight));
}
}
@@ -157,12 +155,8 @@ void PartialMagnificationController::CreateMagnifierWindow() {
window->SetName(kPartialMagniferWindowName);
zoom_widget_->GetNativeView()->layer()->SetBounds(
- gfx::Rect(0, 0,
- kMagnifierWidth,
- kMagnifierHeight));
- zoom_widget_->GetNativeView()->layer()->SetBackgroundZoom(
- scale_,
- kZoomInset);
+ gfx::Rect(0, 0, kMagnifierWidth, kMagnifierHeight));
+ zoom_widget_->GetNativeView()->layer()->SetBackgroundZoom(scale_, kZoomInset);
zoom_widget_->AddObserver(this);
}
@@ -178,8 +172,7 @@ void PartialMagnificationController::CloseMagnifierWindow() {
void PartialMagnificationController::RemoveZoomWidgetObservers() {
DCHECK(zoom_widget_);
zoom_widget_->RemoveObserver(this);
- aura::Window* root_window =
- zoom_widget_->GetNativeView()->GetRootWindow();
+ aura::Window* root_window = zoom_widget_->GetNativeView()->GetRootWindow();
DCHECK(root_window);
root_window->RemoveObserver(this);
}
« no previous file with comments | « ash/magnifier/partial_magnification_controller.h ('k') | ash/metrics/desktop_task_switch_metric_recorder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698