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

Side by Side Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

Issue 2891043002: Revert of Remove WINDOW_TYPE_V1_PANEL AppWindow type (Closed)
Patch Set: 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/multi_user/multi_user_window_manager_chromeos.h" 5 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
6 6
7 #include "ash/media_controller.h" 7 #include "ash/media_controller.h"
8 #include "ash/multi_profile_uma.h" 8 #include "ash/multi_profile_uma.h"
9 #include "ash/public/cpp/shell_window_ids.h" 9 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 std::vector<Profile*> profiles = 81 std::vector<Profile*> profiles =
82 g_browser_process->profile_manager()->GetLoadedProfiles(); 82 g_browser_process->profile_manager()->GetLoadedProfiles();
83 for (std::vector<Profile*>::iterator it = profiles.begin(); 83 for (std::vector<Profile*>::iterator it = profiles.begin();
84 it != profiles.end() && app_window == NULL; 84 it != profiles.end() && app_window == NULL;
85 it++) { 85 it++) {
86 app_window = extensions::AppWindowRegistry::Get(*it) 86 app_window = extensions::AppWindowRegistry::Get(*it)
87 ->GetAppWindowForNativeWindow(window); 87 ->GetAppWindowForNativeWindow(window);
88 } 88 }
89 if (app_window) { 89 if (app_window) {
90 if (app_window->window_type() == 90 if (app_window->window_type() ==
91 extensions::AppWindow::WINDOW_TYPE_PANEL) { 91 extensions::AppWindow::WINDOW_TYPE_PANEL ||
92 app_window->window_type() ==
93 extensions::AppWindow::WINDOW_TYPE_V1_PANEL) {
92 window_type = ash::MultiProfileUMA::TELEPORT_WINDOW_PANEL; 94 window_type = ash::MultiProfileUMA::TELEPORT_WINDOW_PANEL;
93 } else { 95 } else {
94 window_type = ash::MultiProfileUMA::TELEPORT_WINDOW_V2_APP; 96 window_type = ash::MultiProfileUMA::TELEPORT_WINDOW_V2_APP;
95 } 97 }
96 } 98 }
97 } 99 }
98 ash::MultiProfileUMA::RecordTeleportWindowType(window_type); 100 ash::MultiProfileUMA::RecordTeleportWindowType(window_type);
99 } 101 }
100 102
101 bool HasSystemModalTransientChildWindow(aura::Window* window) { 103 bool HasSystemModalTransientChildWindow(aura::Window* window) {
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 window->Hide(); 705 window->Hide();
704 } 706 }
705 707
706 int MultiUserWindowManagerChromeOS::GetAdjustedAnimationTimeInMS( 708 int MultiUserWindowManagerChromeOS::GetAdjustedAnimationTimeInMS(
707 int default_time_in_ms) const { 709 int default_time_in_ms) const {
708 return animation_speed_ == ANIMATION_SPEED_NORMAL ? default_time_in_ms : 710 return animation_speed_ == ANIMATION_SPEED_NORMAL ? default_time_in_ms :
709 (animation_speed_ == ANIMATION_SPEED_FAST ? 10 : 0); 711 (animation_speed_ == ANIMATION_SPEED_FAST ? 10 : 0);
710 } 712 }
711 713
712 } // namespace chrome 714 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698