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

Side by Side Diff: chrome/browser/dom_ui/options/about_page_handler.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/dom_ui/options/about_page_handler.h" 5 #include "chrome/browser/dom_ui/options/about_page_handler.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h"
11 #include "base/basictypes.h" 10 #include "base/basictypes.h"
12 #include "base/callback.h" 11 #include "base/callback.h"
13 #include "base/command_line.h" 12 #include "base/command_line.h"
14 #include "base/i18n/time_formatting.h" 13 #include "base/i18n/time_formatting.h"
15 #include "base/string16.h" 14 #include "base/string16.h"
16 #include "base/string_number_conversions.h" 15 #include "base/string_number_conversions.h"
17 #include "base/time.h" 16 #include "base/time.h"
18 #include "base/utf_string_conversions.h" 17 #include "base/utf_string_conversions.h"
19 #include "base/values.h" 18 #include "base/values.h"
20 #include "chrome/browser/google/google_util.h" 19 #include "chrome/browser/google/google_util.h"
21 #include "chrome/browser/platform_util.h" 20 #include "chrome/browser/platform_util.h"
22 #include "chrome/common/chrome_version_info.h" 21 #include "chrome/common/chrome_version_info.h"
23 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
24 #include "googleurl/src/gurl.h" 23 #include "googleurl/src/gurl.h"
25 #include "grit/browser_resources.h" 24 #include "grit/browser_resources.h"
26 #include "grit/chromium_strings.h" 25 #include "grit/chromium_strings.h"
27 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
28 #include "grit/locale_settings.h" 27 #include "grit/locale_settings.h"
29 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
29 #include "ui/base/resource/resource_bundle.h"
30 #include "webkit/glue/webkit_glue.h" 30 #include "webkit/glue/webkit_glue.h"
31 31
32 #if defined(CHROME_V8) 32 #if defined(CHROME_V8)
33 #include "v8/include/v8.h" 33 #include "v8/include/v8.h"
34 #endif 34 #endif
35 35
36 #if defined(OS_CHROMEOS) 36 #if defined(OS_CHROMEOS)
37 #include "chrome/browser/chromeos/cros/cros_library.h" 37 #include "chrome/browser/chromeos/cros/cros_library.h"
38 #include "chrome/browser/chromeos/cros/power_library.h" 38 #include "chrome/browser/chromeos/cros/power_library.h"
39 #include "chrome/browser/chromeos/cros/update_library.h" 39 #include "chrome/browser/chromeos/cros/update_library.h"
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 417
418 void AboutPageHandler::OnOSVersion(chromeos::VersionLoader::Handle handle, 418 void AboutPageHandler::OnOSVersion(chromeos::VersionLoader::Handle handle,
419 std::string version) { 419 std::string version) {
420 if (version.size()) { 420 if (version.size()) {
421 scoped_ptr<Value> version_string(Value::CreateStringValue(version)); 421 scoped_ptr<Value> version_string(Value::CreateStringValue(version));
422 dom_ui_->CallJavascriptFunction(L"AboutPage.updateOSVersionCallback", 422 dom_ui_->CallJavascriptFunction(L"AboutPage.updateOSVersionCallback",
423 *version_string); 423 *version_string);
424 } 424 }
425 } 425 }
426 #endif 426 #endif
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/ntp_resource_cache.cc ('k') | chrome/browser/dom_ui/options/options_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698