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

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

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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/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 "chrome/browser/ui/host_desktop.h" 11 #include "chrome/browser/ui/host_desktop.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 #include "ui/gfx/host_desktop_type.h"
15 16
16 namespace { 17 namespace {
17 18
18 bool ControlsWindow(aura::Window* window) { 19 bool ControlsWindow(aura::Window* window) {
19 return chrome::GetHostDesktopTypeForNativeWindow(window) == 20 return chrome::GetHostDesktopTypeForNativeWindow(window) ==
20 ui::HOST_DESKTOP_TYPE_ASH; 21 ui::HOST_DESKTOP_TYPE_ASH;
21 } 22 }
22 23
23 } // namespace 24 } // namespace
24 25
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 DCHECK(!other_window->browser_context()->IsOffTheRecord()); 158 DCHECK(!other_window->browser_context()->IsOffTheRecord());
158 if (manager->IsWindowOnDesktopOfUser(other_window->GetNativeWindow(), 159 if (manager->IsWindowOnDesktopOfUser(other_window->GetNativeWindow(),
159 current_user) && 160 current_user) &&
160 app_id == other_window->extension_id() && 161 app_id == other_window->extension_id() &&
161 app_context == other_window->browser_context()) { 162 app_context == other_window->browser_context()) {
162 return true; 163 return true;
163 } 164 }
164 } 165 }
165 return false; 166 return false;
166 } 167 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698