OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/options/about_page_handler.h" | 5 #include "chrome/browser/ui/webui/options/about_page_handler.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 web_ui_->RegisterMessageCallback("CheckNow", | 264 web_ui_->RegisterMessageCallback("CheckNow", |
265 NewCallback(this, &AboutPageHandler::CheckNow)); | 265 NewCallback(this, &AboutPageHandler::CheckNow)); |
266 web_ui_->RegisterMessageCallback("RestartNow", | 266 web_ui_->RegisterMessageCallback("RestartNow", |
267 NewCallback(this, &AboutPageHandler::RestartNow)); | 267 NewCallback(this, &AboutPageHandler::RestartNow)); |
268 #endif | 268 #endif |
269 } | 269 } |
270 | 270 |
271 void AboutPageHandler::PageReady(const ListValue* args) { | 271 void AboutPageHandler::PageReady(const ListValue* args) { |
272 #if defined(OS_CHROMEOS) | 272 #if defined(OS_CHROMEOS) |
273 // Version information is loaded from a callback | 273 // Version information is loaded from a callback |
274 loader_.EnablePlatformVersions(true); | |
275 loader_.GetVersion(&consumer_, | 274 loader_.GetVersion(&consumer_, |
276 NewCallback(this, &AboutPageHandler::OnOSVersion), | 275 NewCallback(this, &AboutPageHandler::OnOSVersion), |
277 chromeos::VersionLoader::VERSION_FULL); | 276 chromeos::VersionLoader::VERSION_FULL); |
278 loader_.GetFirmware(&consumer_, | 277 loader_.GetFirmware(&consumer_, |
279 NewCallback(this, &AboutPageHandler::OnOSFirmware)); | 278 NewCallback(this, &AboutPageHandler::OnOSFirmware)); |
280 | 279 |
281 chromeos::UpdateLibrary* update_library = | 280 chromeos::UpdateLibrary* update_library = |
282 chromeos::CrosLibrary::Get()->GetUpdateLibrary(); | 281 chromeos::CrosLibrary::Get()->GetUpdateLibrary(); |
283 | 282 |
284 update_observer_.reset(new UpdateObserver(this)); | 283 update_observer_.reset(new UpdateObserver(this)); |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 if (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->HasObserver(observer)) { | 441 if (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->HasObserver(observer)) { |
443 // If UpdateLibrary still has the observer, then the page handler is valid. | 442 // If UpdateLibrary still has the observer, then the page handler is valid. |
444 AboutPageHandler* handler = observer->page_handler(); | 443 AboutPageHandler* handler = observer->page_handler(); |
445 scoped_ptr<Value> channel_string(Value::CreateStringValue(channel)); | 444 scoped_ptr<Value> channel_string(Value::CreateStringValue(channel)); |
446 handler->web_ui_->CallJavascriptFunction( | 445 handler->web_ui_->CallJavascriptFunction( |
447 "AboutPage.updateSelectedOptionCallback", *channel_string); | 446 "AboutPage.updateSelectedOptionCallback", *channel_string); |
448 } | 447 } |
449 } | 448 } |
450 | 449 |
451 #endif // defined(OS_CHROMEOS) | 450 #endif // defined(OS_CHROMEOS) |
OLD | NEW |