| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include "grit/locale_settings.h" |
| 7 #include "grit/renderer_resources.h" | 8 #include "grit/renderer_resources.h" |
| 9 #include "ui/base/l10n/l10n_util.h" |
| 8 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| 9 | 11 |
| 10 namespace chrome { | 12 namespace chrome { |
| 11 | 13 |
| 12 SkBitmap* ChromeContentRendererClient::GetSadPluginBitmap() { | 14 SkBitmap* ChromeContentRendererClient::GetSadPluginBitmap() { |
| 13 return ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_SAD_PLUGIN); | 15 return ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_SAD_PLUGIN); |
| 14 } | 16 } |
| 15 | 17 |
| 18 std::string ChromeContentRendererClient::GetDefaultEncoding() { |
| 19 return l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING); |
| 20 } |
| 16 } // namespace chrome | 21 } // namespace chrome |
| OLD | NEW |