commit b8dcef526018a47e7cd985cef724c464d0d958a6
author jamescook <jamescook@chromium.org> Sat Jun 25 14:42:55 2016
committer Commit bot <commit-bot@chromium.org> Sat Jun 25 14:44:56 2016
tree 8cc8a9381950995e444dcf48872d7dc78fa8acdf
parent ac4e116972ed28118bf531c4e7c39a24d16b5df4

clang-format all of //ash

See https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/xq3mqL5rsGQ

Purely mechanical change.

cd ash
find . -name \*.h -o -name \*.cc | xargs ../buildtools/linux64/clang-format -i

BUG=none
TEST=none
TBR=oshima@chromium.org

Review-Url: https://codereview.chromium.org/2095193002
Cr-Commit-Position: refs/heads/master@{#402062}

ash/shell/window_watcher.cc

diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index fc61ea3..5254210 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -25,8 +25,7 @@
 
 class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
  public:
-  explicit WorkspaceWindowWatcher(WindowWatcher* watcher) : watcher_(watcher) {
-  }
+  explicit WorkspaceWindowWatcher(WindowWatcher* watcher) : watcher_(watcher) {}
 
   ~WorkspaceWindowWatcher() override {}
 
@@ -73,7 +72,7 @@
   workspace_window_watcher_.reset(new WorkspaceWindowWatcher(this));
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   for (aura::Window::Windows::iterator iter = root_windows.begin();
-       iter != root_windows.end(); ++ iter) {
+       iter != root_windows.end(); ++iter) {
     workspace_window_watcher_->RootWindowAdded(*iter);
   }
 }
@@ -81,7 +80,7 @@
 WindowWatcher::~WindowWatcher() {
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   for (aura::Window::Windows::iterator iter = root_windows.begin();
-       iter != root_windows.end(); ++ iter) {
+       iter != root_windows.end(); ++iter) {
     workspace_window_watcher_->RootWindowRemoved(*iter);
   }
 }
@@ -107,10 +106,8 @@
 
   SkBitmap icon_bitmap;
   icon_bitmap.allocN32Pixels(16, 16);
-  icon_bitmap.eraseARGB(255,
-                        image_count == 0 ? 255 : 0,
-                        image_count == 1 ? 255 : 0,
-                        image_count == 2 ? 255 : 0);
+  icon_bitmap.eraseARGB(255, image_count == 0 ? 255 : 0,
+                        image_count == 1 ? 255 : 0, image_count == 2 ? 255 : 0);
   image_count = (image_count + 1) % 3;
   item.image = gfx::ImageSkia(gfx::ImageSkiaRep(icon_bitmap, 1.0f));
 
@@ -125,8 +122,8 @@
 }
 
 void WindowWatcher::OnWillRemoveWindow(aura::Window* window) {
-  for (IDToWindow::iterator i = id_to_window_.begin();
-       i != id_to_window_.end(); ++i) {
+  for (IDToWindow::iterator i = id_to_window_.begin(); i != id_to_window_.end();
+       ++i) {
     if (i->second == window) {
       ShelfModel* model = Shell::GetInstance()->shelf_model();
       int index = model->ItemIndexByID(i->first);