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

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

Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 7 years, 7 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) 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/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "chrome/browser/chromeos/profiles/profile_helper.h" 47 #include "chrome/browser/chromeos/profiles/profile_helper.h"
48 #include "chrome/browser/chromeos/system/input_device_settings.h" 48 #include "chrome/browser/chromeos/system/input_device_settings.h"
49 #include "chrome/browser/chromeos/system/statistics_provider.h" 49 #include "chrome/browser/chromeos/system/statistics_provider.h"
50 #include "chrome/browser/chromeos/system/timezone_settings.h" 50 #include "chrome/browser/chromeos/system/timezone_settings.h"
51 #include "chrome/browser/lifetime/application_lifetime.h" 51 #include "chrome/browser/lifetime/application_lifetime.h"
52 #include "chrome/browser/managed_mode/managed_mode.h" 52 #include "chrome/browser/managed_mode/managed_mode.h"
53 #include "chrome/browser/policy/browser_policy_connector.h" 53 #include "chrome/browser/policy/browser_policy_connector.h"
54 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 54 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
55 #include "chrome/common/chrome_constants.h" 55 #include "chrome/common/chrome_constants.h"
56 #include "chrome/common/chrome_notification_types.h" 56 #include "chrome/common/chrome_notification_types.h"
57 #include "chrome/common/chrome_switches.h"
58 #include "chrome/common/pref_names.h" 57 #include "chrome/common/pref_names.h"
58 #include "chromeos/chromeos_switches.h"
59 #include "chromeos/dbus/dbus_thread_manager.h" 59 #include "chromeos/dbus/dbus_thread_manager.h"
60 #include "chromeos/dbus/session_manager_client.h" 60 #include "chromeos/dbus/session_manager_client.h"
61 #include "chromeos/ime/input_method_manager.h" 61 #include "chromeos/ime/input_method_manager.h"
62 #include "chromeos/login/login_state.h" 62 #include "chromeos/login/login_state.h"
63 #include "content/public/browser/notification_service.h" 63 #include "content/public/browser/notification_service.h"
64 #include "content/public/browser/notification_types.h" 64 #include "content/public/browser/notification_types.h"
65 #include "content/public/browser/web_contents.h" 65 #include "content/public/browser/web_contents.h"
66 #include "content/public/browser/web_contents_view.h" 66 #include "content/public/browser/web_contents_view.h"
67 #include "content/public/browser/web_ui.h" 67 #include "content/public/browser/web_ui.h"
68 #include "googleurl/src/gurl.h" 68 #include "googleurl/src/gurl.h"
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 VLOG(1) << "Initial time zone: " << timezone_name; 920 VLOG(1) << "Initial time zone: " << timezone_name;
921 // Apply locale customizations only once to preserve whatever locale 921 // Apply locale customizations only once to preserve whatever locale
922 // user has changed to during OOBE. 922 // user has changed to during OOBE.
923 if (!timezone_name.empty()) { 923 if (!timezone_name.empty()) {
924 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( 924 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
925 UTF8ToUTF16(timezone_name)); 925 UTF8ToUTF16(timezone_name));
926 } 926 }
927 } 927 }
928 928
929 } // namespace chromeos 929 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | chrome/browser/chromeos/login/oobe_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698