Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "chrome/browser/chromeos/login/webui_login_view.h" | 5 #include "chrome/browser/chromeos/login/webui_login_view.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/system/tray/system_tray.h" | 8 #include "ash/system/tray/system_tray.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 229 | 229 |
| 230 void WebUILoginView::OpenProxySettings() { | 230 void WebUILoginView::OpenProxySettings() { |
| 231 ProxySettingsDialog* dialog = | 231 ProxySettingsDialog* dialog = |
| 232 new ProxySettingsDialog(NULL, GetNativeWindow()); | 232 new ProxySettingsDialog(NULL, GetNativeWindow()); |
| 233 dialog->Show(); | 233 dialog->Show(); |
| 234 } | 234 } |
| 235 | 235 |
| 236 void WebUILoginView::SetStatusAreaVisible(bool visible) { | 236 void WebUILoginView::SetStatusAreaVisible(bool visible) { |
| 237 ash::SystemTray* tray = ash::Shell::GetInstance()->system_tray(); | 237 ash::SystemTray* tray = ash::Shell::GetInstance()->system_tray(); |
| 238 if (tray) { | 238 if (tray) { |
| 239 if (visible) | 239 if (visible) { |
| 240 // Tray may have been initialized being hidden. | |
|
sadrul
2012/07/25 17:47:28
Do you know when/why this happens?
Nikita (slow)
2012/07/25 17:54:17
That is how it is initialized if it needs to be hi
sadrul
2012/07/25 17:56:27
Ah, cool. Thanks!
| |
| 241 tray->SetVisible(visible); | |
| 240 tray->GetWidget()->Show(); | 242 tray->GetWidget()->Show(); |
| 241 else | 243 } else { |
| 242 tray->GetWidget()->Hide(); | 244 tray->GetWidget()->Hide(); |
| 245 } | |
| 243 } | 246 } |
| 244 } | 247 } |
| 245 | 248 |
| 246 // WebUILoginView protected: --------------------------------------------------- | 249 // WebUILoginView protected: --------------------------------------------------- |
| 247 | 250 |
| 248 void WebUILoginView::Layout() { | 251 void WebUILoginView::Layout() { |
| 249 DCHECK(webui_login_); | 252 DCHECK(webui_login_); |
| 250 webui_login_->SetBoundsRect(bounds()); | 253 webui_login_->SetBoundsRect(bounds()); |
| 251 } | 254 } |
| 252 | 255 |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 355 aura::Env::GetInstance()->set_render_white_bg(true); | 358 aura::Env::GetInstance()->set_render_white_bg(true); |
| 356 } | 359 } |
| 357 | 360 |
| 358 void WebUILoginView::ReturnFocus(bool reverse) { | 361 void WebUILoginView::ReturnFocus(bool reverse) { |
| 359 // Return the focus to the web contents. | 362 // Return the focus to the web contents. |
| 360 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); | 363 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); |
| 361 GetWidget()->Activate(); | 364 GetWidget()->Activate(); |
| 362 } | 365 } |
| 363 | 366 |
| 364 } // namespace chromeos | 367 } // namespace chromeos |
| OLD | NEW |