OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "content/shell/shell_content_client.h" | 5 #include "content/shell/shell_content_client.h" |
6 | 6 |
7 #include "base/string_piece.h" | 7 #include "base/string_piece.h" |
8 #include "ui/base/resource/resource_bundle.h" | 8 #include "ui/base/resource/resource_bundle.h" |
| 9 #include "ui/base/resource/resource_handle.h" |
9 #include "webkit/glue/user_agent.h" | 10 #include "webkit/glue/user_agent.h" |
10 | 11 |
11 namespace content { | 12 namespace content { |
12 | 13 |
13 ShellContentClient::~ShellContentClient() { | 14 ShellContentClient::~ShellContentClient() { |
14 } | 15 } |
15 | 16 |
16 void ShellContentClient::SetActiveURL(const GURL& url) { | 17 void ShellContentClient::SetActiveURL(const GURL& url) { |
17 } | 18 } |
18 | 19 |
(...skipping 27 matching lines...) Expand all Loading... |
46 // something reasonably current; the "77.34.5" is a hint that this isn't a | 47 // something reasonably current; the "77.34.5" is a hint that this isn't a |
47 // standard Chrome. | 48 // standard Chrome. |
48 return webkit_glue::BuildUserAgentFromProduct("Chrome/19.77.34.5"); | 49 return webkit_glue::BuildUserAgentFromProduct("Chrome/19.77.34.5"); |
49 } | 50 } |
50 | 51 |
51 string16 ShellContentClient::GetLocalizedString(int message_id) const { | 52 string16 ShellContentClient::GetLocalizedString(int message_id) const { |
52 return string16(); | 53 return string16(); |
53 } | 54 } |
54 | 55 |
55 base::StringPiece ShellContentClient::GetDataResource(int resource_id) const { | 56 base::StringPiece ShellContentClient::GetDataResource(int resource_id) const { |
56 return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); | 57 return ResourceBundle::GetSharedInstance().GetRawDataResource( |
| 58 resource_id, ui::ResourceHandle::kScaleFactorNone); |
57 } | 59 } |
58 | 60 |
59 #if defined(OS_WIN) | 61 #if defined(OS_WIN) |
60 bool ShellContentClient::SandboxPlugin(CommandLine* command_line, | 62 bool ShellContentClient::SandboxPlugin(CommandLine* command_line, |
61 sandbox::TargetPolicy* policy) { | 63 sandbox::TargetPolicy* policy) { |
62 return false; | 64 return false; |
63 } | 65 } |
64 #endif | 66 #endif |
65 | 67 |
66 #if defined(OS_MACOSX) | 68 #if defined(OS_MACOSX) |
67 bool ShellContentClient::GetSandboxProfileForSandboxType( | 69 bool ShellContentClient::GetSandboxProfileForSandboxType( |
68 int sandbox_type, | 70 int sandbox_type, |
69 int* sandbox_profile_resource_id) const { | 71 int* sandbox_profile_resource_id) const { |
70 return false; | 72 return false; |
71 } | 73 } |
72 #endif | 74 #endif |
73 | 75 |
74 } // namespace content | 76 } // namespace content |
OLD | NEW |