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

Side by Side Diff: chrome/browser/chromeos/login/webui_login_view.cc

Issue 8289021: chromeos: Change all clients of LoginLibrary to use SessionManagerClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: renamed Created 9 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/chromeos/accessibility_util.h" 12 #include "chrome/browser/chromeos/accessibility_util.h"
13 #include "chrome/browser/chromeos/cros/cros_library.h" 13 #include "chrome/browser/chromeos/cros/cros_library.h"
14 #include "chrome/browser/chromeos/cros/login_library.h" 14 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
15 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
15 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h" 16 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
16 #include "chrome/browser/chromeos/login/webui_login_display.h" 17 #include "chrome/browser/chromeos/login/webui_login_display.h"
17 #include "chrome/browser/chromeos/status/clock_menu_button.h" 18 #include "chrome/browser/chromeos/status/clock_menu_button.h"
18 #include "chrome/browser/chromeos/status/input_method_menu_button.h" 19 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
19 #include "chrome/browser/chromeos/status/network_menu_button.h" 20 #include "chrome/browser/chromeos/status/network_menu_button.h"
20 #include "chrome/browser/chromeos/status/status_area_view.h" 21 #include "chrome/browser/chromeos/status/status_area_view.h"
21 #include "chrome/browser/profiles/profile_manager.h" 22 #include "chrome/browser/profiles/profile_manager.h"
22 #include "chrome/browser/ui/views/dom_view.h" 23 #include "chrome/browser/ui/views/dom_view.h"
23 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 24 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
24 #include "chrome/common/render_messages.h" 25 #include "chrome/common/render_messages.h"
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 308
308 // In aura or views-desktop environment, there will be no window-manager. So 309 // In aura or views-desktop environment, there will be no window-manager. So
309 // chrome needs to emit the 'login-prompt-visible' signal. This needs to 310 // chrome needs to emit the 'login-prompt-visible' signal. This needs to
310 // happen here, after the page has completed rendering itself. 311 // happen here, after the page has completed rendering itself.
311 #if defined(USE_AURA) 312 #if defined(USE_AURA)
312 emit_login_visible = true; 313 emit_login_visible = true;
313 #else 314 #else
314 if (views::desktop::DesktopWindowView::desktop_window_view) 315 if (views::desktop::DesktopWindowView::desktop_window_view)
315 emit_login_visible = true; 316 emit_login_visible = true;
316 #endif 317 #endif
317 if (emit_login_visible && chromeos::CrosLibrary::Get()->EnsureLoaded()) 318 if (emit_login_visible)
318 chromeos::CrosLibrary::Get()->GetLoginLibrary()->EmitLoginPromptVisible(); 319 chromeos::DBusThreadManager::Get()->session_manager_client()
320 ->EmitLoginPromptVisible();
319 321
320 OobeUI* oobe_ui = static_cast<OobeUI*>(GetWebUI()); 322 OobeUI* oobe_ui = static_cast<OobeUI*>(GetWebUI());
321 // Notify OOBE that the login frame has been rendered. Currently 323 // Notify OOBE that the login frame has been rendered. Currently
322 // this is used to start camera presence check. 324 // this is used to start camera presence check.
323 oobe_ui->OnLoginPromptVisible(); 325 oobe_ui->OnLoginPromptVisible();
324 } 326 }
325 327
326 void WebUILoginView::InitStatusArea() { 328 void WebUILoginView::InitStatusArea() {
327 DCHECK(status_area_ == NULL); 329 DCHECK(status_area_ == NULL);
328 DCHECK(status_window_ == NULL); 330 DCHECK(status_window_ == NULL);
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 WebUI* web_ui = GetWebUI(); 415 WebUI* web_ui = GetWebUI();
414 if (web_ui) 416 if (web_ui)
415 web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors"); 417 web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
416 } 418 }
417 419
418 views::Widget* WebUILoginView::GetLoginWindow() { 420 views::Widget* WebUILoginView::GetLoginWindow() {
419 return WebUILoginDisplay::GetLoginWindow(); 421 return WebUILoginDisplay::GetLoginWindow();
420 } 422 }
421 423
422 } // namespace chromeos 424 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/update_screen_browsertest.cc ('k') | chrome/browser/ui/browser_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698