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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc

Issue 2392273002: ChromeOS: Implement Update screen of material design OOBE. (Closed)
Patch Set: Update after review. Added new screen name. Created 4 years, 2 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
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_update.js ('k') | no next file » | 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/ui/webui/chromeos/login/update_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/login/screens/update_model.h" 10 #include "chrome/browser/chromeos/login/screens/update_model.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 IDS_DOWNLOADING_TIME_LEFT_STATUS_MINUTES); 46 IDS_DOWNLOADING_TIME_LEFT_STATUS_MINUTES);
47 builder->Add("downloadingTimeLeftSmall", IDS_DOWNLOADING_TIME_LEFT_SMALL); 47 builder->Add("downloadingTimeLeftSmall", IDS_DOWNLOADING_TIME_LEFT_SMALL);
48 48
49 #if !defined(OFFICIAL_BUILD) 49 #if !defined(OFFICIAL_BUILD)
50 builder->Add("cancelUpdateHint", IDS_UPDATE_CANCEL); 50 builder->Add("cancelUpdateHint", IDS_UPDATE_CANCEL);
51 builder->Add("cancelledUpdateMessage", IDS_UPDATE_CANCELLED); 51 builder->Add("cancelledUpdateMessage", IDS_UPDATE_CANCELLED);
52 #else 52 #else
53 builder->Add("cancelUpdateHint", IDS_EMPTY_STRING); 53 builder->Add("cancelUpdateHint", IDS_EMPTY_STRING);
54 builder->Add("cancelledUpdateMessage", IDS_EMPTY_STRING); 54 builder->Add("cancelledUpdateMessage", IDS_EMPTY_STRING);
55 #endif 55 #endif
56
57 // For Material Design OOBE
58 builder->Add("updatingScreenTitle", IDS_UPDATING_SCREEN_TITLE);
56 } 59 }
57 60
58 void UpdateScreenHandler::Initialize() { 61 void UpdateScreenHandler::Initialize() {
59 if (show_on_init_) { 62 if (show_on_init_) {
60 Show(); 63 Show();
61 show_on_init_ = false; 64 show_on_init_ = false;
62 } 65 }
63 } 66 }
64 67
65 void UpdateScreenHandler::PrepareToShow() { 68 void UpdateScreenHandler::PrepareToShow() {
(...skipping 14 matching lines...) Expand all
80 model_ = &model; 83 model_ = &model;
81 BaseScreenHandler::SetBaseScreen(model_); 84 BaseScreenHandler::SetBaseScreen(model_);
82 } 85 }
83 86
84 void UpdateScreenHandler::Unbind() { 87 void UpdateScreenHandler::Unbind() {
85 model_ = nullptr; 88 model_ = nullptr;
86 BaseScreenHandler::SetBaseScreen(nullptr); 89 BaseScreenHandler::SetBaseScreen(nullptr);
87 } 90 }
88 91
89 } // namespace chromeos 92 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_update.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698