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

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

Issue 3130044: Added browser test for the OOBE update screen.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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
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/update_view.h" 5 #include "chrome/browser/chromeos/login/update_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 escape_to_skip_label_->SetFont(label_font); 92 escape_to_skip_label_->SetFont(label_font);
93 escape_to_skip_label_->SetText( 93 escape_to_skip_label_->SetText(
94 L"Press ESCAPE to skip (Non-official builds only)"); 94 L"Press ESCAPE to skip (Non-official builds only)");
95 AddChildView(escape_to_skip_label_); 95 AddChildView(escape_to_skip_label_);
96 #endif 96 #endif
97 } 97 }
98 98
99 void UpdateView::Reset() { 99 void UpdateView::Reset() {
100 progress_bar_->SetProgress(0); 100 progress_bar_->SetProgress(0);
101 #if !defined(OFFICIAL_BUILD) 101 #if !defined(OFFICIAL_BUILD)
102 ResetAccelerators();
102 AddAccelerator(escape_accelerator_); 103 AddAccelerator(escape_accelerator_);
103 #endif 104 #endif
104 } 105 }
105 106
106 void UpdateView::UpdateLocalizedStrings() { 107 void UpdateView::UpdateLocalizedStrings() {
107 installing_updates_label_->SetText( 108 installing_updates_label_->SetText(
108 l10n_util::GetStringF(IDS_INSTALLING_UPDATE, 109 l10n_util::GetStringF(IDS_INSTALLING_UPDATE,
109 l10n_util::GetString(IDS_PRODUCT_OS_NAME))); 110 l10n_util::GetString(IDS_PRODUCT_OS_NAME)));
110 reboot_label_->SetText(l10n_util::GetString(IDS_INSTALLING_UPDATE_DESC)); 111 reboot_label_->SetText(l10n_util::GetString(IDS_INSTALLING_UPDATE_DESC));
111 manual_reboot_label_->SetText(l10n_util::GetString(IDS_UPDATE_COMPLETED)); 112 manual_reboot_label_->SetText(l10n_util::GetString(IDS_UPDATE_COMPLETED));
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 173
173 void UpdateView::InitLabel(views::Label** label) { 174 void UpdateView::InitLabel(views::Label** label) {
174 *label = new views::Label(); 175 *label = new views::Label();
175 (*label)->SetColor(kLabelColor); 176 (*label)->SetColor(kLabelColor);
176 (*label)->SetHorizontalAlignment(views::Label::ALIGN_CENTER); 177 (*label)->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
177 (*label)->SetMultiLine(true); 178 (*label)->SetMultiLine(true);
178 AddChildView(*label); 179 AddChildView(*label);
179 } 180 }
180 181
181 } // namespace chromeos 182 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/update_screen_browsertest.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698