apps/shell/common/shell_content_client.cc - Issue 151893002: Reorganize apps/shell into app, browser and common directories

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: apps/shell/common/shell_content_client.cc

Issue 151893002: Reorganize apps/shell into app, browser and common directories (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix ash (subdirs) Created 6 years, 10 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

« apps/DEPS ('K') | « apps/shell/common/shell_content_client.h ('k') | apps/shell/common/shell_extensions_client.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "apps/shell/shell_content_client.h"	5 #include "apps/shell/common/shell_content_client.h"

6	6

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

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

9 #include "extensions/common/constants.h"	9 #include "extensions/common/constants.h"

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

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

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

13	13

14 namespace apps {	14 namespace apps {

15	15

(...skipping 30 matching lines...) Expand all Loading...
46 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes(	46 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes(

47 int resource_id) const {	47 int resource_id) const {

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

49 }	49 }

50	50

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

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

53 }	53 }

54	54

55 } // namespace apps	55 } // namespace apps

OLD	NEW