OLD | NEW |
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/dom_ui/options/about_page_handler.h" | 5 #include "chrome/browser/dom_ui/options/about_page_handler.h" |
6 | 6 |
| 7 #include <vector> |
| 8 |
7 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
9 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
10 #include "base/callback.h" | 12 #include "base/callback.h" |
11 #include "base/command_line.h" | 13 #include "base/command_line.h" |
12 #include "base/i18n/time_formatting.h" | 14 #include "base/i18n/time_formatting.h" |
13 #include "base/string16.h" | 15 #include "base/string16.h" |
14 #include "base/string_number_conversions.h" | 16 #include "base/string_number_conversions.h" |
15 #include "base/time.h" | 17 #include "base/time.h" |
16 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
17 #include "base/values.h" | 19 #include "base/values.h" |
18 #include "chrome/browser/browser_process.h" | |
19 #include "chrome/browser/platform_util.h" | 20 #include "chrome/browser/platform_util.h" |
20 #include "chrome/common/chrome_version_info.h" | 21 #include "chrome/common/chrome_version_info.h" |
21 #include "chrome/common/notification_service.h" | 22 #include "chrome/common/notification_service.h" |
22 #include "chrome/common/url_constants.h" | 23 #include "chrome/common/url_constants.h" |
23 #include "googleurl/src/gurl.h" | 24 #include "googleurl/src/gurl.h" |
24 #include "grit/browser_resources.h" | 25 #include "grit/browser_resources.h" |
25 #include "grit/chromium_strings.h" | 26 #include "grit/chromium_strings.h" |
26 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
27 #include "grit/locale_settings.h" | 28 #include "grit/locale_settings.h" |
28 #include "grit/theme_resources.h" | 29 #include "grit/theme_resources.h" |
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
392 | 393 |
393 void AboutPageHandler::OnOSVersion(chromeos::VersionLoader::Handle handle, | 394 void AboutPageHandler::OnOSVersion(chromeos::VersionLoader::Handle handle, |
394 std::string version) { | 395 std::string version) { |
395 if (version.size()) { | 396 if (version.size()) { |
396 scoped_ptr<Value> version_string(Value::CreateStringValue(version)); | 397 scoped_ptr<Value> version_string(Value::CreateStringValue(version)); |
397 dom_ui_->CallJavascriptFunction(L"AboutPage.updateOSVersionCallback", | 398 dom_ui_->CallJavascriptFunction(L"AboutPage.updateOSVersionCallback", |
398 *version_string); | 399 *version_string); |
399 } | 400 } |
400 } | 401 } |
401 #endif | 402 #endif |
OLD | NEW |