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

Side by Side Diff: chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc

Issue 2839933005: mash: Merge ChromeLauncherController and *Impl subclass. (Closed)
Patch Set: Address comments. Created 3 years, 7 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 unified diff | Download patch
OLDNEW
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/launcher/chrome_launcher_controller_impl.h" 9 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
10 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 10 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
11 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 11 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
12 #include "components/signin/core/account_id/account_id.h" 12 #include "components/signin/core/account_id/account_id.h"
13 #include "extensions/browser/app_window/app_window.h" 13 #include "extensions/browser/app_window/app_window.h"
14 #include "extensions/browser/app_window/native_app_window.h" 14 #include "extensions/browser/app_window/native_app_window.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 16
17 MultiProfileAppWindowLauncherController:: 17 MultiProfileAppWindowLauncherController::
18 MultiProfileAppWindowLauncherController(ChromeLauncherControllerImpl* owner) 18 MultiProfileAppWindowLauncherController(ChromeLauncherController* owner)
19 : ExtensionAppWindowLauncherController(owner) { 19 : ExtensionAppWindowLauncherController(owner) {
20 // We might have already active windows. 20 // We might have already active windows.
21 extensions::AppWindowRegistry* registry = 21 extensions::AppWindowRegistry* registry =
22 extensions::AppWindowRegistry::Get(owner->profile()); 22 extensions::AppWindowRegistry::Get(owner->profile());
23 app_window_list_.insert(app_window_list_.end(), 23 app_window_list_.insert(app_window_list_.end(),
24 registry->app_windows().begin(), 24 registry->app_windows().begin(),
25 registry->app_windows().end()); 25 registry->app_windows().end());
26 } 26 }
27 27
28 MultiProfileAppWindowLauncherController:: 28 MultiProfileAppWindowLauncherController::
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 DCHECK(!other_window->browser_context()->IsOffTheRecord()); 145 DCHECK(!other_window->browser_context()->IsOffTheRecord());
146 if (manager->IsWindowOnDesktopOfUser(other_window->GetNativeWindow(), 146 if (manager->IsWindowOnDesktopOfUser(other_window->GetNativeWindow(),
147 current_account_id) && 147 current_account_id) &&
148 app_id == other_window->extension_id() && 148 app_id == other_window->extension_id() &&
149 app_context == other_window->browser_context()) { 149 app_context == other_window->browser_context()) {
150 return true; 150 return true;
151 } 151 }
152 } 152 }
153 return false; 153 return false;
154 } 154 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698