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

Side by Side Diff: chrome/common/chrome_content_client_ios.mm

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "chrome/common/chrome_version_info.h"
10 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
10 #include "components/version_info/version_info.h"
11 #include "content/public/common/user_agent.h" 11 #include "content/public/common/user_agent.h"
12 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
13 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
14 #include "url/gurl.h" 14 #include "url/gurl.h"
15 15
16 // TODO(ios): Investigate merging with chrome_content_client.cc; this would 16 // TODO(ios): Investigate merging with chrome_content_client.cc; this would
17 // requiring either a lot of ifdefing, or spliting the file into parts. 17 // requiring either a lot of ifdefing, or spliting the file into parts.
18 18
19 void ChromeContentClient::SetActiveURL(const GURL& url) { 19 void ChromeContentClient::SetActiveURL(const GURL& url) {
20 NOTIMPLEMENTED(); 20 NOTIMPLEMENTED();
21 } 21 }
22 22
23 void ChromeContentClient::SetGpuInfo(const gpu::GPUInfo& gpu_info) { 23 void ChromeContentClient::SetGpuInfo(const gpu::GPUInfo& gpu_info) {
24 NOTIMPLEMENTED(); 24 NOTIMPLEMENTED();
25 } 25 }
26 26
27 void ChromeContentClient::AddPepperPlugins( 27 void ChromeContentClient::AddPepperPlugins(
28 std::vector<content::PepperPluginInfo>* plugins) { 28 std::vector<content::PepperPluginInfo>* plugins) {
29 NOTREACHED(); 29 NOTREACHED();
30 } 30 }
31 31
32 void ChromeContentClient::AddAdditionalSchemes( 32 void ChromeContentClient::AddAdditionalSchemes(
33 std::vector<std::string>* standard_schemes, 33 std::vector<std::string>* standard_schemes,
34 std::vector<std::string>* saveable_shemes) { 34 std::vector<std::string>* saveable_shemes) {
35 // No additional schemes for iOS. 35 // No additional schemes for iOS.
36 } 36 }
37 37
38 std::string ChromeContentClient::GetProduct() const { 38 std::string ChromeContentClient::GetProduct() const {
39 chrome::VersionInfo version_info;
40 std::string product("CriOS/"); 39 std::string product("CriOS/");
41 product += version_info.Version(); 40 product += version_info::GetVersionNumber();
42 return product; 41 return product;
43 } 42 }
44 43
45 std::string ChromeContentClient::GetUserAgent() const { 44 std::string ChromeContentClient::GetUserAgent() const {
46 std::string product = GetProduct(); 45 std::string product = GetProduct();
47 return content::BuildUserAgentFromProduct(product); 46 return content::BuildUserAgentFromProduct(product);
48 } 47 }
49 48
50 base::string16 ChromeContentClient::GetLocalizedString(int message_id) const { 49 base::string16 ChromeContentClient::GetLocalizedString(int message_id) const {
51 return l10n_util::GetStringUTF16(message_id); 50 return l10n_util::GetStringUTF16(message_id);
(...skipping 10 matching lines...) Expand all
62 int resource_id) const { 61 int resource_id) const {
63 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id); 62 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
64 } 63 }
65 64
66 gfx::Image& ChromeContentClient::GetNativeImageNamed(int resource_id) const { 65 gfx::Image& ChromeContentClient::GetNativeImageNamed(int resource_id) const {
67 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); 66 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
68 } 67 }
69 68
70 std::string ChromeContentClient::GetProcessTypeNameInEnglish(int type) { 69 std::string ChromeContentClient::GetProcessTypeNameInEnglish(int type) {
71 DCHECK(false) << "Unknown child process type!"; 70 DCHECK(false) << "Unknown child process type!";
72 return "Unknown"; 71 return "Unknown";
73 } 72 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698