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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 443673002: Make "Join other network dialog" and "Join mobile network dialog" opens properly on multiple signin… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/system_tray_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 ash::IMEInfo* info) { 130 ash::IMEInfo* info) {
131 info->id = ime.id(); 131 info->id = ime.id();
132 info->name = util.GetInputMethodLongName(ime); 132 info->name = util.GetInputMethodLongName(ime);
133 info->medium_name = util.GetInputMethodMediumName(ime); 133 info->medium_name = util.GetInputMethodMediumName(ime);
134 info->short_name = util.GetInputMethodShortName(ime); 134 info->short_name = util.GetInputMethodShortName(ime);
135 info->third_party = extension_ime_util::IsExtensionIME(ime.id()); 135 info->third_party = extension_ime_util::IsExtensionIME(ime.id());
136 } 136 }
137 137
138 gfx::NativeWindow GetNativeWindowByStatus(ash::user::LoginStatus login_status, 138 gfx::NativeWindow GetNativeWindowByStatus(ash::user::LoginStatus login_status,
139 bool session_started) { 139 bool session_started) {
140 bool isUserAddingRunning = ash::Shell::GetInstance()
141 ->session_state_delegate()
142 ->IsInSecondaryLoginScreen();
143
140 int container_id = 144 int container_id =
141 (!session_started || login_status == ash::user::LOGGED_IN_NONE || 145 (!session_started || login_status == ash::user::LOGGED_IN_NONE ||
142 login_status == ash::user::LOGGED_IN_LOCKED) 146 login_status == ash::user::LOGGED_IN_LOCKED || isUserAddingRunning)
143 ? ash::kShellWindowId_LockSystemModalContainer 147 ? ash::kShellWindowId_LockSystemModalContainer
144 : ash::kShellWindowId_SystemModalContainer; 148 : ash::kShellWindowId_SystemModalContainer;
145 return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), 149 return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
146 container_id); 150 container_id);
147 } 151 }
148 152
149 void BluetoothPowerFailure() { 153 void BluetoothPowerFailure() {
150 // TODO(sad): Show an error bubble? 154 // TODO(sad): Show an error bubble?
151 } 155 }
152 156
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 accessibility_subscription_.reset(); 1278 accessibility_subscription_.reset();
1275 else 1279 else
1276 OnAccessibilityModeChanged(details.notify); 1280 OnAccessibilityModeChanged(details.notify);
1277 } 1281 }
1278 1282
1279 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1283 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1280 return new SystemTrayDelegateChromeOS(); 1284 return new SystemTrayDelegateChromeOS();
1281 } 1285 }
1282 1286
1283 } // namespace chromeos 1287 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698