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

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

Issue 4179001: [cros] Fix UI issues on SignIn pod. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 10 years, 1 month 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_screen.h" 5 #include "chrome/browser/chromeos/login/login_screen.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/process_util.h" 12 #include "base/process_util.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/browser_thread.h" 15 #include "chrome/browser/browser_thread.h"
16 #include "chrome/browser/chromeos/boot_times_loader.h" 16 #include "chrome/browser/chromeos/boot_times_loader.h"
17 #include "chrome/browser/chromeos/cros/cros_library.h" 17 #include "chrome/browser/chromeos/cros/cros_library.h"
18 #include "chrome/browser/chromeos/cros/network_library.h" 18 #include "chrome/browser/chromeos/cros/network_library.h"
19 #include "chrome/browser/chromeos/login/authentication_notification_details.h" 19 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
20 #include "chrome/browser/chromeos/login/helper.h" 20 #include "chrome/browser/chromeos/login/helper.h"
21 #include "chrome/browser/chromeos/login/login_utils.h" 21 #include "chrome/browser/chromeos/login/login_utils.h"
22 #include "chrome/browser/chromeos/login/message_bubble.h" 22 #include "chrome/browser/chromeos/login/message_bubble.h"
23 #include "chrome/browser/chromeos/login/screen_observer.h" 23 #include "chrome/browser/chromeos/login/screen_observer.h"
24 #include "chrome/browser/profile.h" 24 #include "chrome/browser/profile.h"
25 #include "chrome/browser/profile_manager.h" 25 #include "chrome/browser/profile_manager.h"
26 #include "chrome/common/notification_service.h" 26 #include "chrome/common/notification_service.h"
27 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
28 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
29 29
30 namespace {
31
32 // Considering 10px shadow from each side.
33 const int kLoginScreenWidth = 288;
34 const int kLoginScreenHeight = 318;
35
36 } // anonymous namespace
37
30 namespace chromeos { 38 namespace chromeos {
31 39
32 LoginScreen::LoginScreen(WizardScreenDelegate* delegate) 40 LoginScreen::LoginScreen(WizardScreenDelegate* delegate)
33 : ViewScreen<NewUserView>(delegate), 41 : ViewScreen<NewUserView>(delegate, kLoginScreenWidth, kLoginScreenHeight),
34 bubble_(NULL), 42 bubble_(NULL),
35 authenticator_(NULL) { 43 authenticator_(NULL) {
36 if (CrosLibrary::Get()->EnsureLoaded()) { 44 if (CrosLibrary::Get()->EnsureLoaded()) {
37 authenticator_ = LoginUtils::Get()->CreateAuthenticator(this); 45 authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
38 } 46 }
39 } 47 }
40 48
41 LoginScreen::~LoginScreen() { 49 LoginScreen::~LoginScreen() {
42 ClearErrors(); 50 ClearErrors();
43 } 51 }
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 view()->GetWidget(), 137 view()->GetWidget(),
130 view()->GetPasswordBounds(), 138 view()->GetPasswordBounds(),
131 BubbleBorder::LEFT_TOP, 139 BubbleBorder::LEFT_TOP,
132 ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING), 140 ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING),
133 error_text, 141 error_text,
134 l10n_util::GetString(IDS_CANT_ACCESS_ACCOUNT_BUTTON), 142 l10n_util::GetString(IDS_CANT_ACCESS_ACCOUNT_BUTTON),
135 this); 143 this);
136 } 144 }
137 145
138 } // namespace chromeos 146 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/helper.cc ('k') | chrome/browser/chromeos/login/message_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698