Misc. cleanup found while running clang-format.

Wanted to minimize the amount of manual change in the clang-format
patch itself.

Bug: 1053845
Change-Id: I893c61571967f50d2d8a141caf72ac953000d1d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2063899
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Thomas Lukaszewicz <tluk@chromium.org>
Reviewed-by: Thomas Lukaszewicz <tluk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742659}

ui/views/controls/image_view.h

@@ -81,8 +81,6 @@ class VIEWS_EXPORT ImageView : public View {
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void PreferredSizeChanged() override;
 
- protected:
-
  private:
   friend class ImageViewTest;
 

ui/views/controls/native/native_view_host_aura.cc

@@ -55,9 +55,8 @@ class NativeViewHostAura::ClippingWindowDelegate : public aura::WindowDelegate {
     // Ask the hosted native view's delegate because directly calling
     // aura::Window::CanFocus() will call back into this when checking whether
     // parents can focus.
-    return native_view_ && native_view_->delegate()
-        ? native_view_->delegate()->CanFocus()
-        : true;
+    return !native_view_ || !native_view_->delegate() ||
+           native_view_->delegate()->CanFocus();
   }
   void OnCaptureLost() override {}
   void OnPaint(const ui::PaintContext& context) override {}

ui/views/controls/native/native_view_host_unittest.cc

@@ -69,7 +69,7 @@ class ViewHierarchyChangedTestHost : public NativeViewHost {
     return num_parent_changes_;
   }
 
-  // Overriden from NativeViewHost:
+  // NativeViewHost:
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override {
     gfx::NativeView parent_before =

ui/views/controls/slider.cc

@@ -165,9 +165,7 @@ void Slider::PrepareForMove(const int new_x) {
   float value = GetAnimatingValue();
 
   const int thumb_x = value * (content.width() - kThumbWidth);
-  const int candidate_x = (base::i18n::IsRTL() ?
-      width() - (new_x - inset.left()) :
-      new_x - inset.left()) - thumb_x;
+  const int candidate_x = GetMirroredXInView(new_x - inset.left()) - thumb_x;
   if (candidate_x >= 0 && candidate_x < kThumbWidth)
     initial_button_offset_ = candidate_x;
   else

ui/views/examples/widget_example.cc

@@ -87,7 +87,7 @@ void WidgetExample::BuildButton(View* container,
 }
 
 void WidgetExample::ShowWidget(View* sender, Widget::InitParams params) {
-  // Setup shared Widget heirarchy and bounds parameters.
+  // Setup shared Widget hierarchy and bounds parameters.
   params.parent = sender->GetWidget()->GetNativeView();
   params.bounds = gfx::Rect(sender->GetBoundsInScreen().CenterPoint(),
                             gfx::Size(300, 200));

ui/views/widget/desktop_aura/x11_desktop_handler.h

@@ -18,10 +18,6 @@
 #include "ui/views/views_export.h"
 #include "ui/views/widget/desktop_aura/x11_desktop_handler_observer.h"
 
-namespace base {
-template <typename T> struct DefaultSingletonTraits;
-}
-
 namespace ui {
 class XScopedEventSelector;
 }

ui/views/widget/widget.h

@@ -153,18 +153,17 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
 
   struct VIEWS_EXPORT InitParams {
     enum Type {
-      TYPE_WINDOW,      // A decorated Window, like a frame window.
-                        // Widgets of TYPE_WINDOW will have a NonClientView.
-      TYPE_WINDOW_FRAMELESS,
-                        // An undecorated Window.
-      TYPE_CONTROL,     // A control, like a button.
-      TYPE_POPUP,       // An undecorated Window, with transient properties.
-      TYPE_MENU,        // An undecorated Window, with transient properties
-                        // specialized to menus.
+      TYPE_WINDOW,  // A decorated Window, like a frame window.
+                    // Widgets of TYPE_WINDOW will have a NonClientView.
+      TYPE_WINDOW_FRAMELESS,  // An undecorated Window.
+      TYPE_CONTROL,           // A control, like a button.
+      TYPE_POPUP,  // An undecorated Window, with transient properties.
+      TYPE_MENU,   // An undecorated Window, with transient properties
+                   // specialized to menus.
       TYPE_TOOLTIP,
       TYPE_BUBBLE,
-      TYPE_DRAG,        // An undecorated Window, used during a drag-and-drop to
-                        // show the drag image.
+      TYPE_DRAG,  // An undecorated Window, used during a drag-and-drop to
+                  // show the drag image.
     };
 
     enum class WindowOpacity {

ui/views/widget/widget_interactive_uitest.cc

@@ -169,11 +169,13 @@ class NestedLoopCaptureView : public View {
 ui::WindowShowState GetWidgetShowState(const Widget* widget) {
   // Use IsMaximized/IsMinimized/IsFullScreen instead of GetWindowPlacement
   // because the former is implemented on all platforms but the latter is not.
-  return widget->IsFullscreen() ? ui::SHOW_STATE_FULLSCREEN :
-      widget->IsMaximized() ? ui::SHOW_STATE_MAXIMIZED :
-      widget->IsMinimized() ? ui::SHOW_STATE_MINIMIZED :
-      widget->IsActive() ? ui::SHOW_STATE_NORMAL :
-                           ui::SHOW_STATE_INACTIVE;
+  if (widget->IsFullscreen())
+    return ui::SHOW_STATE_FULLSCREEN;
+  if (widget->IsMaximized())
+    return ui::SHOW_STATE_MAXIMIZED;
+  if (widget->IsMinimized())
+    return ui::SHOW_STATE_MINIMIZED;
+  return widget->IsActive() ? ui::SHOW_STATE_NORMAL : ui::SHOW_STATE_INACTIVE;
 }
 
 // Give the OS an opportunity to process messages for an activation change, when