content/shell/common/shell_content_client.cc - Issue 16408017: Use a direct include of utf_string_conversions.h in content/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/shell/common/shell_content_client.cc

Issue 16408017: Use a direct include of utf_string_conversions.h in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « content/renderer/webplugin_delegate_proxy.cc ('k') | content/shell/common/webkit_test_helpers.cc » ('j') | no next file with comments »

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/common/shell_content_client.h"	5 #include "content/shell/common/shell_content_client.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/strings/string_piece.h"	8 #include "base/strings/string_piece.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "content/public/common/content_switches.h"	10 #include "content/public/common/content_switches.h"

11 #include "content/shell/common/shell_switches.h"	11 #include "content/shell/common/shell_switches.h"

12 #include "grit/shell_resources.h"	12 #include "grit/shell_resources.h"

13 #include "grit/webkit_resources.h"	13 #include "grit/webkit_resources.h"

14 #include "grit/webkit_strings.h"	14 #include "grit/webkit_strings.h"

15 #include "ui/base/l10n/l10n_util.h"	15 #include "ui/base/l10n/l10n_util.h"

16 #include "ui/base/resource/resource_bundle.h"	16 #include "ui/base/resource/resource_bundle.h"

17 #include "webkit/common/user_agent/user_agent_util.h"	17 #include "webkit/common/user_agent/user_agent_util.h"

18	18

19 namespace content {	19 namespace content {

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes(	78 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes(

79 int resource_id) const {	79 int resource_id) const {

80 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);	80 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);

81 }	81 }

82	82

83 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {	83 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {

84 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);	84 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);

85 }	85 }

86	86

87 } // namespace content	87 } // namespace content

OLD	NEW