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

Side by Side Diff: ash/system/ime/tray_ime.cc

Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review 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 | « ash/system/date/date_default_view.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/system/ime/tray_ime.h" 5 #include "ash/system/ime/tray_ime.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/metrics/user_metrics_recorder.h" 9 #include "ash/metrics/user_metrics_recorder.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
11 #include "ash/session/session_state_delegate.h"
11 #include "ash/shelf/shelf_widget.h" 12 #include "ash/shelf/shelf_widget.h"
12 #include "ash/shell.h" 13 #include "ash/shell.h"
13 #include "ash/system/tray/hover_highlight_view.h" 14 #include "ash/system/tray/hover_highlight_view.h"
14 #include "ash/system/tray/system_tray.h" 15 #include "ash/system/tray/system_tray.h"
15 #include "ash/system/tray/system_tray_delegate.h" 16 #include "ash/system/tray/system_tray_delegate.h"
16 #include "ash/system/tray/system_tray_notifier.h" 17 #include "ash/system/tray/system_tray_notifier.h"
17 #include "ash/system/tray/tray_constants.h" 18 #include "ash/system/tray/tray_constants.h"
18 #include "ash/system/tray/tray_details_view.h" 19 #include "ash/system/tray/tray_details_view.h"
19 #include "ash/system/tray/tray_item_more.h" 20 #include "ash/system/tray/tray_item_more.h"
20 #include "ash/system/tray/tray_item_view.h" 21 #include "ash/system/tray/tray_item_view.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 108
108 virtual ~IMEDetailedView() {} 109 virtual ~IMEDetailedView() {}
109 110
110 void Update(const IMEInfoList& list, 111 void Update(const IMEInfoList& list,
111 const IMEPropertyInfoList& property_list) { 112 const IMEPropertyInfoList& property_list) {
112 Reset(); 113 Reset();
113 114
114 AppendIMEList(list); 115 AppendIMEList(list);
115 if (!property_list.empty()) 116 if (!property_list.empty())
116 AppendIMEProperties(property_list); 117 AppendIMEProperties(property_list);
117 if (login_ != user::LOGGED_IN_NONE && login_ != user::LOGGED_IN_LOCKED) 118 bool userAddingRunning = ash::Shell::GetInstance()
119 ->session_state_delegate()
120 ->IsInSecondaryLoginScreen();
121
122 if (login_ != user::LOGGED_IN_NONE && login_ != user::LOGGED_IN_LOCKED &&
123 !userAddingRunning)
118 AppendSettings(); 124 AppendSettings();
119 AppendHeaderEntry(); 125 AppendHeaderEntry();
120 126
121 Layout(); 127 Layout();
122 SchedulePaint(); 128 SchedulePaint();
123 } 129 }
124 130
125 private: 131 private:
126 void AppendHeaderEntry() { 132 void AppendHeaderEntry() {
127 CreateSpecialRow(IDS_ASH_STATUS_TRAY_IME, this); 133 CreateSpecialRow(IDS_ASH_STATUS_TRAY_IME, this);
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 300
295 UpdateTrayLabel(current, list.size()); 301 UpdateTrayLabel(current, list.size());
296 302
297 if (default_) 303 if (default_)
298 default_->UpdateLabel(current); 304 default_->UpdateLabel(current);
299 if (detailed_) 305 if (detailed_)
300 detailed_->Update(list, property_list); 306 detailed_->Update(list, property_list);
301 } 307 }
302 308
303 } // namespace ash 309 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/date/date_default_view.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698