OLD | NEW |
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2014 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/ui/settings_window_manager.h" | 5 #include "chrome/browser/ui/settings_window_manager.h" |
6 | 6 |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/ui/browser_finder.h" | 8 #include "chrome/browser/ui/browser_finder.h" |
9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
10 #include "chrome/browser/ui/browser_navigator.h" | 10 #include "chrome/browser/ui/browser_navigator.h" |
11 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
12 #include "chrome/browser/ui/chrome_pages.h" | 12 #include "chrome/browser/ui/chrome_pages.h" |
13 #include "chrome/browser/ui/settings_window_manager_observer.h" | 13 #include "chrome/browser/ui/settings_window_manager_observer.h" |
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
15 #include "content/public/browser/user_metrics.h" | 15 #include "content/public/browser/user_metrics.h" |
16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
17 #include "url/gurl.h" | 17 #include "url/gurl.h" |
18 | 18 |
19 namespace chrome { | 19 namespace chrome { |
20 | 20 |
21 // static | 21 // static |
22 SettingsWindowManager* SettingsWindowManager::GetInstance() { | 22 SettingsWindowManager* SettingsWindowManager::GetInstance() { |
23 return Singleton<SettingsWindowManager>::get(); | 23 return base::Singleton<SettingsWindowManager>::get(); |
24 } | 24 } |
25 | 25 |
26 void SettingsWindowManager::AddObserver( | 26 void SettingsWindowManager::AddObserver( |
27 SettingsWindowManagerObserver* observer) { | 27 SettingsWindowManagerObserver* observer) { |
28 observers_.AddObserver(observer); | 28 observers_.AddObserver(observer); |
29 } | 29 } |
30 | 30 |
31 void SettingsWindowManager::RemoveObserver( | 31 void SettingsWindowManager::RemoveObserver( |
32 SettingsWindowManagerObserver* observer) { | 32 SettingsWindowManagerObserver* observer) { |
33 observers_.RemoveObserver(observer); | 33 observers_.RemoveObserver(observer); |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 iter->second == browser->session_id().id()); | 87 iter->second == browser->session_id().id()); |
88 } | 88 } |
89 | 89 |
90 SettingsWindowManager::SettingsWindowManager() { | 90 SettingsWindowManager::SettingsWindowManager() { |
91 } | 91 } |
92 | 92 |
93 SettingsWindowManager::~SettingsWindowManager() { | 93 SettingsWindowManager::~SettingsWindowManager() { |
94 } | 94 } |
95 | 95 |
96 } // namespace chrome | 96 } // namespace chrome |
OLD | NEW |