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

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

Issue 21004005: Made small refactoring of OobeUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed location of .oobe_completed. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/startup_utils.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 "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/desktop_background/desktop_background_controller.h" 9 #include "ash/desktop_background/desktop_background_controller.h"
10 #include "ash/desktop_background/user_wallpaper_delegate.h" 10 #include "ash/desktop_background/user_wallpaper_delegate.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "ui/compositor/scoped_layer_animation_settings.h" 70 #include "ui/compositor/scoped_layer_animation_settings.h"
71 #include "ui/gfx/rect.h" 71 #include "ui/gfx/rect.h"
72 #include "ui/gfx/transform.h" 72 #include "ui/gfx/transform.h"
73 #include "ui/views/focus/focus_manager.h" 73 #include "ui/views/focus/focus_manager.h"
74 #include "ui/views/widget/widget.h" 74 #include "ui/views/widget/widget.h"
75 #include "url/gurl.h" 75 #include "url/gurl.h"
76 76
77 namespace { 77 namespace {
78 78
79 // URL which corresponds to the login WebUI. 79 // URL which corresponds to the login WebUI.
80 const char kLoginURL[] = "chrome://oobe/login#login"; 80 const char kLoginURL[] = "chrome://oobe/login";
81 81
82 // URL which corresponds to the OOBE WebUI. 82 // URL which corresponds to the OOBE WebUI.
83 const char kOobeURL[] = "chrome://oobe#login"; 83 const char kOobeURL[] = "chrome://oobe/oobe";
84 84
85 // URL which corresponds to the user adding WebUI. 85 // URL which corresponds to the user adding WebUI.
86 const char kUserAddingURL[] = "chrome://oobe/login#user-adding"; 86 const char kUserAddingURL[] = "chrome://oobe/user-adding";
87 87
88 // Duration of sign-in transition animation. 88 // Duration of sign-in transition animation.
89 const int kLoginFadeoutTransitionDurationMs = 700; 89 const int kLoginFadeoutTransitionDurationMs = 700;
90 90
91 // Number of times we try to reload OOBE/login WebUI if it crashes. 91 // Number of times we try to reload OOBE/login WebUI if it crashes.
92 const int kCrashCountLimit = 5; 92 const int kCrashCountLimit = 5;
93 93
94 // Whether to enable tnitializing WebUI in hidden state (see 94 // Whether to enable tnitializing WebUI in hidden state (see
95 // |initialize_webui_hidden_|) by default. 95 // |initialize_webui_hidden_|) by default.
96 const bool kHiddenWebUIInitializationDefault = true; 96 const bool kHiddenWebUIInitializationDefault = true;
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 VLOG(1) << "Initial time zone: " << timezone_name; 953 VLOG(1) << "Initial time zone: " << timezone_name;
954 // Apply locale customizations only once to preserve whatever locale 954 // Apply locale customizations only once to preserve whatever locale
955 // user has changed to during OOBE. 955 // user has changed to during OOBE.
956 if (!timezone_name.empty()) { 956 if (!timezone_name.empty()) {
957 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( 957 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
958 UTF8ToUTF16(timezone_name)); 958 UTF8ToUTF16(timezone_name));
959 } 959 }
960 } 960 }
961 961
962 } // namespace chromeos 962 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/startup_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698