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

Side by Side Diff: chrome/browser/browser_about_handler.cc

Issue 1560027: Refactor FileVersionInfo into an interface with platform implementations. (Closed)
Patch Set: comments Created 10 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
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/bug_report_util.cc » ('j') | 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) 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/browser_about_handler.h" 5 #include "chrome/browser/browser_about_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
11 #include "app/resource_bundle.h" 11 #include "app/resource_bundle.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/file_version_info.h" 13 #include "base/file_version_info.h"
14 #include "base/histogram.h" 14 #include "base/histogram.h"
15 #include "base/i18n/number_formatting.h" 15 #include "base/i18n/number_formatting.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/platform_thread.h" 17 #include "base/platform_thread.h"
18 #include "base/stats_table.h" 18 #include "base/stats_table.h"
19 #include "base/string_piece.h" 19 #include "base/string_piece.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/thread.h" 21 #include "base/thread.h"
22 #include "base/tracked_objects.h" 22 #include "base/tracked_objects.h"
23 #include "chrome/app/chrome_version_info.h"
23 #include "chrome/browser/browser.h" 24 #include "chrome/browser/browser.h"
24 #include "chrome/browser/browser_process.h" 25 #include "chrome/browser/browser_process.h"
25 #include "chrome/browser/chrome_thread.h" 26 #include "chrome/browser/chrome_thread.h"
26 #include "chrome/browser/defaults.h" 27 #include "chrome/browser/defaults.h"
27 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 28 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
28 #include "chrome/browser/google_service_auth_error.h" 29 #include "chrome/browser/google_service_auth_error.h"
29 #include "chrome/browser/memory_details.h" 30 #include "chrome/browser/memory_details.h"
30 #include "chrome/browser/metrics/histogram_synchronizer.h" 31 #include "chrome/browser/metrics/histogram_synchronizer.h"
31 #include "chrome/browser/net/dns_global.h" 32 #include "chrome/browser/net/dns_global.h"
32 #include "chrome/browser/pref_service.h" 33 #include "chrome/browser/pref_service.h"
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 ResourceBundle::GetSharedInstance().GetDataResource( 471 ResourceBundle::GetSharedInstance().GetDataResource(
471 IDR_TERMS_HTML); 472 IDR_TERMS_HTML);
472 473
473 return terms_html; 474 return terms_html;
474 } 475 }
475 476
476 std::string AboutVersion(DictionaryValue* localized_strings) { 477 std::string AboutVersion(DictionaryValue* localized_strings) {
477 localized_strings->SetString(L"title", 478 localized_strings->SetString(L"title",
478 l10n_util::GetString(IDS_ABOUT_VERSION_TITLE)); 479 l10n_util::GetString(IDS_ABOUT_VERSION_TITLE));
479 scoped_ptr<FileVersionInfo> version_info( 480 scoped_ptr<FileVersionInfo> version_info(
480 FileVersionInfo::CreateFileVersionInfoForCurrentModule()); 481 chrome_app::GetChromeVersionInfo());
481 if (version_info == NULL) { 482 if (version_info == NULL) {
482 DLOG(ERROR) << "Unable to create FileVersionInfo object"; 483 DLOG(ERROR) << "Unable to create FileVersionInfo object";
483 return std::string(); 484 return std::string();
484 } 485 }
485 486
486 std::string webkit_version = webkit_glue::GetWebKitVersion(); 487 std::string webkit_version = webkit_glue::GetWebKitVersion();
487 #ifdef CHROME_V8 488 #ifdef CHROME_V8
488 std::string js_version(v8::V8::GetVersion()); 489 std::string js_version(v8::V8::GetVersion());
489 std::string js_engine = "V8"; 490 std::string js_engine = "V8";
490 #else 491 #else
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 // Run the dialog. This will re-use the existing one if it's already up. 988 // Run the dialog. This will re-use the existing one if it's already up.
988 AboutIPCDialog::RunDialog(); 989 AboutIPCDialog::RunDialog();
989 return true; 990 return true;
990 } 991 }
991 #endif 992 #endif
992 993
993 #endif // OFFICIAL_BUILD 994 #endif // OFFICIAL_BUILD
994 995
995 return false; 996 return false;
996 } 997 }
OLDNEW
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/bug_report_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698