| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/extensions/window_controller_list.h" | 5 #include "chrome/browser/extensions/window_controller_list.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "chrome/browser/extensions/api/tabs/windows_util.h" | 9 #include "chrome/browser/extensions/api/tabs/windows_util.h" |
| 10 #include "chrome/browser/extensions/chrome_extension_function_details.h" | 10 #include "chrome/browser/extensions/chrome_extension_function_details.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 } | 25 } |
| 26 | 26 |
| 27 WindowControllerList::WindowControllerList() { | 27 WindowControllerList::WindowControllerList() { |
| 28 } | 28 } |
| 29 | 29 |
| 30 WindowControllerList::~WindowControllerList() { | 30 WindowControllerList::~WindowControllerList() { |
| 31 } | 31 } |
| 32 | 32 |
| 33 void WindowControllerList::AddExtensionWindow(WindowController* window) { | 33 void WindowControllerList::AddExtensionWindow(WindowController* window) { |
| 34 windows_.push_back(window); | 34 windows_.push_back(window); |
| 35 FOR_EACH_OBSERVER(WindowControllerListObserver, observers_, | 35 for (auto& observer : observers_) |
| 36 OnWindowControllerAdded(window)); | 36 observer.OnWindowControllerAdded(window); |
| 37 } | 37 } |
| 38 | 38 |
| 39 void WindowControllerList::RemoveExtensionWindow(WindowController* window) { | 39 void WindowControllerList::RemoveExtensionWindow(WindowController* window) { |
| 40 ControllerList::iterator iter = std::find( | 40 ControllerList::iterator iter = std::find( |
| 41 windows_.begin(), windows_.end(), window); | 41 windows_.begin(), windows_.end(), window); |
| 42 if (iter != windows_.end()) { | 42 if (iter != windows_.end()) { |
| 43 windows_.erase(iter); | 43 windows_.erase(iter); |
| 44 FOR_EACH_OBSERVER(WindowControllerListObserver, observers_, | 44 for (auto& observer : observers_) |
| 45 OnWindowControllerRemoved(window)); | 45 observer.OnWindowControllerRemoved(window); |
| 46 } | 46 } |
| 47 } | 47 } |
| 48 | 48 |
| 49 void WindowControllerList::AddObserver(WindowControllerListObserver* observer) { | 49 void WindowControllerList::AddObserver(WindowControllerListObserver* observer) { |
| 50 observers_.AddObserver(observer); | 50 observers_.AddObserver(observer); |
| 51 } | 51 } |
| 52 | 52 |
| 53 void WindowControllerList::RemoveObserver( | 53 void WindowControllerList::RemoveObserver( |
| 54 WindowControllerListObserver* observer) { | 54 WindowControllerListObserver* observer) { |
| 55 observers_.RemoveObserver(observer); | 55 observers_.RemoveObserver(observer); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 if (windows_util::CanOperateOnWindow(function, *iter, filter)) { | 101 if (windows_util::CanOperateOnWindow(function, *iter, filter)) { |
| 102 result = *iter; | 102 result = *iter; |
| 103 if (result->window()->IsActive()) | 103 if (result->window()->IsActive()) |
| 104 break; // use focused window | 104 break; // use focused window |
| 105 } | 105 } |
| 106 } | 106 } |
| 107 return result; | 107 return result; |
| 108 } | 108 } |
| 109 | 109 |
| 110 } // namespace extensions | 110 } // namespace extensions |
| OLD | NEW |