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

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

Issue 9664072: Removing WmIpc and related files from ChromeOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Copyright Created 8 years, 9 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 (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/base_login_display_host.h" 5 #include "chrome/browser/chromeos/login/base_login_display_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
35 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
36 #include "content/public/browser/notification_service.h" 36 #include "content/public/browser/notification_service.h"
37 #include "content/public/browser/notification_types.h" 37 #include "content/public/browser/notification_types.h"
38 #include "googleurl/src/gurl.h" 38 #include "googleurl/src/gurl.h"
39 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" 39 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
40 #include "ui/base/resource/resource_bundle.h" 40 #include "ui/base/resource/resource_bundle.h"
41 #include "ui/gfx/rect.h" 41 #include "ui/gfx/rect.h"
42 #include "unicode/timezone.h" 42 #include "unicode/timezone.h"
43 43
44 #if defined(TOOLKIT_USES_GTK)
45 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
46 #endif
47
48 #if defined(USE_AURA) 44 #if defined(USE_AURA)
49 #include "ash/shell.h" 45 #include "ash/shell.h"
50 #include "ash/shell_window_ids.h" 46 #include "ash/shell_window_ids.h"
51 #include "ui/aura/window.h" 47 #include "ui/aura/window.h"
52 #include "ui/gfx/compositor/layer.h" 48 #include "ui/gfx/compositor/layer.h"
53 #include "ui/gfx/compositor/layer_animation_element.h" 49 #include "ui/gfx/compositor/layer_animation_element.h"
54 #include "ui/gfx/compositor/layer_animation_sequence.h" 50 #include "ui/gfx/compositor/layer_animation_sequence.h"
55 #include "ui/gfx/compositor/layer_animator.h" 51 #include "ui/gfx/compositor/layer_animator.h"
56 #include "ui/gfx/compositor/scoped_layer_animation_settings.h" 52 #include "ui/gfx/compositor/scoped_layer_animation_settings.h"
57 #include "ui/gfx/transform.h" 53 #include "ui/gfx/transform.h"
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 void ShowLoginWizard(const std::string& first_screen_name, 458 void ShowLoginWizard(const std::string& first_screen_name,
463 const gfx::Size& size) { 459 const gfx::Size& size) {
464 if (browser_shutdown::IsTryingToQuit()) 460 if (browser_shutdown::IsTryingToQuit())
465 return; 461 return;
466 462
467 VLOG(1) << "Showing OOBE screen: " << first_screen_name; 463 VLOG(1) << "Showing OOBE screen: " << first_screen_name;
468 464
469 chromeos::input_method::InputMethodManager* manager = 465 chromeos::input_method::InputMethodManager* manager =
470 chromeos::input_method::InputMethodManager::GetInstance(); 466 chromeos::input_method::InputMethodManager::GetInstance();
471 467
472 #if defined(TOOLKIT_USES_GTK)
473 // Tell the window manager that the user isn't logged in.
474 chromeos::WmIpc::instance()->SetLoggedInProperty(false);
475 #endif
476
477 // Set up keyboards. For example, when |locale| is "en-US", enable US qwerty 468 // Set up keyboards. For example, when |locale| is "en-US", enable US qwerty
478 // and US dvorak keyboard layouts. 469 // and US dvorak keyboard layouts.
479 if (g_browser_process && g_browser_process->local_state()) { 470 if (g_browser_process && g_browser_process->local_state()) {
480 const std::string locale = g_browser_process->GetApplicationLocale(); 471 const std::string locale = g_browser_process->GetApplicationLocale();
481 // If the preferred keyboard for the login screen has been saved, use it. 472 // If the preferred keyboard for the login screen has been saved, use it.
482 std::string initial_input_method_id = 473 std::string initial_input_method_id =
483 g_browser_process->local_state()->GetString( 474 g_browser_process->local_state()->GetString(
484 chromeos::language_prefs::kPreferredKeyboardLayout); 475 chromeos::language_prefs::kPreferredKeyboardLayout);
485 if (initial_input_method_id.empty()) { 476 if (initial_input_method_id.empty()) {
486 // If kPreferredKeyboardLayout is not specified, use the hardware layout. 477 // If kPreferredKeyboardLayout is not specified, use the hardware layout.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 // user has changed to during OOBE. 571 // user has changed to during OOBE.
581 if (!timezone_name.empty()) { 572 if (!timezone_name.empty()) {
582 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( 573 icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
583 icu::UnicodeString::fromUTF8(timezone_name)); 574 icu::UnicodeString::fromUTF8(timezone_name));
584 CHECK(timezone) << "Timezone could not be set for " << timezone_name; 575 CHECK(timezone) << "Timezone could not be set for " << timezone_name;
585 chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone); 576 chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone);
586 } 577 }
587 } 578 }
588 579
589 } // namespace browser 580 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/legacy_window_manager/wm_message_listener.cc ('k') | chrome/browser/chromeos/login/lock_window_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698