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

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

Issue 14063018: Implemented argument wrapping for CallJS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Get rid of macro. Created 7 years, 8 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/ui/webui/chromeos/login/update_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 9 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
10 #include "grit/chromium_strings.h" 10 #include "grit/chromium_strings.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #endif 71 #endif
72 } 72 }
73 73
74 void UpdateScreenHandler::Hide() { 74 void UpdateScreenHandler::Hide() {
75 } 75 }
76 76
77 void UpdateScreenHandler::PrepareToShow() { 77 void UpdateScreenHandler::PrepareToShow() {
78 } 78 }
79 79
80 void UpdateScreenHandler::ShowManualRebootInfo() { 80 void UpdateScreenHandler::ShowManualRebootInfo() {
81 StringValue message(l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED)); 81 CallJS("cr.ui.Oobe.setUpdateMessage",
82 CallJS("cr.ui.Oobe.setUpdateMessage", message); 82 l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED));
83 } 83 }
84 84
85 void UpdateScreenHandler::SetProgress(int progress) { 85 void UpdateScreenHandler::SetProgress(int progress) {
86 base::FundamentalValue progress_value(progress); 86 CallJS("cr.ui.Oobe.setUpdateProgress", progress);
87 CallJS("cr.ui.Oobe.setUpdateProgress", progress_value);
88 } 87 }
89 88
90 void UpdateScreenHandler::ShowEstimatedTimeLeft(bool visible) { 89 void UpdateScreenHandler::ShowEstimatedTimeLeft(bool visible) {
91 base::FundamentalValue visible_value(visible); 90 CallJS("cr.ui.Oobe.showEstimatedTimeLeft", visible);
92 CallJS("cr.ui.Oobe.showEstimatedTimeLeft", visible_value);
93 } 91 }
94 92
95 void UpdateScreenHandler::SetEstimatedTimeLeft(const base::TimeDelta& time) { 93 void UpdateScreenHandler::SetEstimatedTimeLeft(const base::TimeDelta& time) {
96 base::FundamentalValue seconds_value(time.InSecondsF()); 94 CallJS("cr.ui.Oobe.setEstimatedTimeLeft", time.InSecondsF());
97 CallJS("cr.ui.Oobe.setEstimatedTimeLeft", seconds_value);
98 } 95 }
99 96
100 void UpdateScreenHandler::ShowProgressMessage(bool visible) { 97 void UpdateScreenHandler::ShowProgressMessage(bool visible) {
101 base::FundamentalValue visible_value(visible); 98 CallJS("cr.ui.Oobe.showProgressMessage", visible);
102 CallJS("cr.ui.Oobe.showProgressMessage", visible_value);
103 } 99 }
104 100
105 void UpdateScreenHandler::SetProgressMessage(ProgressMessage message) { 101 void UpdateScreenHandler::SetProgressMessage(ProgressMessage message) {
106 scoped_ptr<StringValue> progress_message; 102 scoped_ptr<StringValue> progress_message;
107 switch (message) { 103 switch (message) {
108 case PROGRESS_MESSAGE_UPDATE_AVAILABLE: 104 case PROGRESS_MESSAGE_UPDATE_AVAILABLE:
109 progress_message.reset(Value::CreateStringValue( 105 progress_message.reset(Value::CreateStringValue(
110 l10n_util::GetStringUTF16(IDS_UPDATE_AVAILABLE))); 106 l10n_util::GetStringUTF16(IDS_UPDATE_AVAILABLE)));
111 break; 107 break;
112 case PROGRESS_MESSAGE_INSTALLING_UPDATE: 108 case PROGRESS_MESSAGE_INSTALLING_UPDATE:
(...skipping 10 matching lines...) Expand all
123 l10n_util::GetStringUTF16(IDS_UPDATE_FINALIZING))); 119 l10n_util::GetStringUTF16(IDS_UPDATE_FINALIZING)));
124 break; 120 break;
125 default: 121 default:
126 NOTREACHED(); 122 NOTREACHED();
127 }; 123 };
128 if (progress_message.get()) 124 if (progress_message.get())
129 CallJS("cr.ui.Oobe.setProgressMessage", *progress_message); 125 CallJS("cr.ui.Oobe.setProgressMessage", *progress_message);
130 } 126 }
131 127
132 void UpdateScreenHandler::ShowCurtain(bool visible) { 128 void UpdateScreenHandler::ShowCurtain(bool visible) {
133 base::FundamentalValue visible_value(visible); 129 CallJS("cr.ui.Oobe.showUpdateCurtain", visible);
134 CallJS("cr.ui.Oobe.showUpdateCurtain", visible_value);
135 } 130 }
136 131
137 void UpdateScreenHandler::RegisterMessages() { 132 void UpdateScreenHandler::RegisterMessages() {
138 #if !defined(OFFICIAL_BUILD) 133 #if !defined(OFFICIAL_BUILD)
139 AddCallback("cancelUpdate", &UpdateScreenHandler::HandleUpdateCancel); 134 AddCallback("cancelUpdate", &UpdateScreenHandler::HandleUpdateCancel);
140 #endif 135 #endif
141 } 136 }
142 137
143 #if !defined(OFFICIAL_BUILD) 138 #if !defined(OFFICIAL_BUILD)
144 void UpdateScreenHandler::HandleUpdateCancel() { 139 void UpdateScreenHandler::HandleUpdateCancel() {
145 screen_->CancelUpdate(); 140 screen_->CancelUpdate();
146 } 141 }
147 #endif 142 #endif
148 143
149 } // namespace chromeos 144 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698