| OLD | NEW | 
|   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" |   9 #include "chrome/common/chrome_version_info.h" | 
|  10 #include "chrome/common/url_constants.h" |  10 #include "chrome/common/url_constants.h" | 
 |  11 #include "content/public/common/user_agent.h" | 
|  11 #include "ui/base/l10n/l10n_util.h" |  12 #include "ui/base/l10n/l10n_util.h" | 
|  12 #include "ui/base/resource/resource_bundle.h" |  13 #include "ui/base/resource/resource_bundle.h" | 
|  13 #include "url/gurl.h" |  14 #include "url/gurl.h" | 
|  14 #include "webkit/common/user_agent/user_agent_util.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(); | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
|  43  |  43  | 
|  44 std::string ChromeContentClient::GetProduct() const { |  44 std::string ChromeContentClient::GetProduct() const { | 
|  45   chrome::VersionInfo version_info; |  45   chrome::VersionInfo version_info; | 
|  46   std::string product("CriOS/"); |  46   std::string product("CriOS/"); | 
|  47   product += version_info.is_valid() ? version_info.Version() : "0.0.0.0"; |  47   product += version_info.is_valid() ? version_info.Version() : "0.0.0.0"; | 
|  48   return product; |  48   return product; | 
|  49 } |  49 } | 
|  50  |  50  | 
|  51 std::string ChromeContentClient::GetUserAgent() const { |  51 std::string ChromeContentClient::GetUserAgent() const { | 
|  52   std::string product = GetProduct(); |  52   std::string product = GetProduct(); | 
|  53   return webkit_glue::BuildUserAgentFromProduct(product); |  53   return content::BuildUserAgentFromProduct(product); | 
|  54 } |  54 } | 
|  55  |  55  | 
|  56 base::string16 ChromeContentClient::GetLocalizedString(int message_id) const { |  56 base::string16 ChromeContentClient::GetLocalizedString(int message_id) const { | 
|  57   return l10n_util::GetStringUTF16(message_id); |  57   return l10n_util::GetStringUTF16(message_id); | 
|  58 } |  58 } | 
|  59  |  59  | 
|  60 base::StringPiece ChromeContentClient::GetDataResource( |  60 base::StringPiece ChromeContentClient::GetDataResource( | 
|  61     int resource_id, |  61     int resource_id, | 
|  62     ui::ScaleFactor scale_factor) const { |  62     ui::ScaleFactor scale_factor) const { | 
|  63   return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale( |  63   return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale( | 
|  64       resource_id, scale_factor); |  64       resource_id, scale_factor); | 
|  65 } |  65 } | 
|  66  |  66  | 
|  67 base::RefCountedStaticMemory* ChromeContentClient::GetDataResourceBytes( |  67 base::RefCountedStaticMemory* ChromeContentClient::GetDataResourceBytes( | 
|  68     int resource_id) const { |  68     int resource_id) const { | 
|  69   return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id); |  69   return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id); | 
|  70 } |  70 } | 
|  71  |  71  | 
|  72 gfx::Image& ChromeContentClient::GetNativeImageNamed(int resource_id) const { |  72 gfx::Image& ChromeContentClient::GetNativeImageNamed(int resource_id) const { | 
|  73   return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); |  73   return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); | 
|  74 } |  74 } | 
|  75  |  75  | 
|  76 std::string ChromeContentClient::GetProcessTypeNameInEnglish(int type) { |  76 std::string ChromeContentClient::GetProcessTypeNameInEnglish(int type) { | 
|  77   DCHECK(false) << "Unknown child process type!"; |  77   DCHECK(false) << "Unknown child process type!"; | 
|  78   return "Unknown";  |  78   return "Unknown";  | 
|  79 } |  79 } | 
| OLD | NEW |