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

Unified Diff: ash/shell/window_watcher.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/shell/window_type_launcher.cc ('k') | ash/shell/window_watcher_shelf_item_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/window_watcher.cc
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index fc61ea32d7c05901efc00a16f734c9256c7ac4fe..5254210b7501974dfb480d5eacadc75741cc32e0 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -25,8 +25,7 @@ namespace shell {
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 @@ WindowWatcher::WindowWatcher() {
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() {
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 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) {
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::OnWindowAdded(aura::Window* new_window) {
}
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);
« no previous file with comments | « ash/shell/window_type_launcher.cc ('k') | ash/shell/window_watcher_shelf_item_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698