| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 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/ash/launcher/multi_profile_app_window_launcher_contr
oller.h" | 5 #include "chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_contr
oller.h" |
| 6 | 6 |
| 7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
| 8 #include "chrome/browser/profiles/profile_manager.h" | 8 #include "chrome/browser/profiles/profile_manager.h" |
| 9 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 9 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
| 10 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" | 10 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
| 11 #include "components/signin/core/account_id/account_id.h" | 11 #include "components/signin/core/account_id/account_id.h" |
| 12 #include "extensions/browser/app_window/app_window.h" | 12 #include "extensions/browser/app_window/app_window.h" |
| 13 #include "extensions/browser/app_window/native_app_window.h" | 13 #include "extensions/browser/app_window/native_app_window.h" |
| 14 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
| 15 | 15 |
| 16 MultiProfileAppWindowLauncherController:: | 16 MultiProfileAppWindowLauncherController:: |
| 17 MultiProfileAppWindowLauncherController(ChromeLauncherController* owner) | 17 MultiProfileAppWindowLauncherController(ChromeLauncherController* owner) |
| 18 : AppWindowLauncherController(owner) {} | 18 : ExtensionAppWindowLauncherController(owner) {} |
| 19 | 19 |
| 20 MultiProfileAppWindowLauncherController:: | 20 MultiProfileAppWindowLauncherController:: |
| 21 ~MultiProfileAppWindowLauncherController() { | 21 ~MultiProfileAppWindowLauncherController() { |
| 22 // We need to remove all Registry observers for added users. | 22 // We need to remove all Registry observers for added users. |
| 23 for (AppWindowRegistryList::iterator it = multi_user_registry_.begin(); | 23 for (AppWindowRegistryList::iterator it = multi_user_registry_.begin(); |
| 24 it != multi_user_registry_.end(); | 24 it != multi_user_registry_.end(); |
| 25 ++it) | 25 ++it) |
| 26 (*it)->RemoveObserver(this); | 26 (*it)->RemoveObserver(this); |
| 27 } | 27 } |
| 28 | 28 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 DCHECK(!other_window->browser_context()->IsOffTheRecord()); | 136 DCHECK(!other_window->browser_context()->IsOffTheRecord()); |
| 137 if (manager->IsWindowOnDesktopOfUser(other_window->GetNativeWindow(), | 137 if (manager->IsWindowOnDesktopOfUser(other_window->GetNativeWindow(), |
| 138 current_account_id) && | 138 current_account_id) && |
| 139 app_id == other_window->extension_id() && | 139 app_id == other_window->extension_id() && |
| 140 app_context == other_window->browser_context()) { | 140 app_context == other_window->browser_context()) { |
| 141 return true; | 141 return true; |
| 142 } | 142 } |
| 143 } | 143 } |
| 144 return false; | 144 return false; |
| 145 } | 145 } |
| OLD | NEW |