chrome/browser/extensions/extension_nacl_browsertest.cc - Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

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: chrome/browser/extensions/extension_nacl_browsertest.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (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 | « chrome/browser/extensions/extension_install_prompt.cc ('k') | chrome/browser/extensions/extension_prefs.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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/files/file_path.h"	6 #include "base/files/file_path.h"

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

8 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

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

10 #include "chrome/browser/extensions/crx_installer.h"	10 #include "chrome/browser/extensions/crx_installer.h"

11 #include "chrome/browser/extensions/extension_browsertest.h"	11 #include "chrome/browser/extensions/extension_browsertest.h"

12 #include "chrome/browser/extensions/extension_service.h"	12 #include "chrome/browser/extensions/extension_service.h"

13 #include "chrome/browser/extensions/extension_system.h"	13 #include "chrome/browser/extensions/extension_system.h"

14 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/ui/browser.h"	15 #include "chrome/browser/ui/browser.h"

16 #include "chrome/browser/ui/tabs/tab_strip_model.h"	16 #include "chrome/browser/ui/tabs/tab_strip_model.h"

17 #include "chrome/common/chrome_paths.h"	17 #include "chrome/common/chrome_paths.h"

18 #include "chrome/common/chrome_switches.h"	18 #include "chrome/common/chrome_switches.h"

19 #include "chrome/common/pref_names.h"	19 #include "chrome/common/pref_names.h"

(...skipping 187 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
207 replace_host.SetHostStr(host_str);	207 replace_host.SetHostStr(host_str);

208 replace_host.ClearPort();	208 replace_host.ClearPort();

209 url = url.ReplaceComponents(replace_host);	209 url = url.ReplaceComponents(replace_host);

210	210

211 const Extension* extension = InstallHostedApp();	211 const Extension* extension = InstallHostedApp();

212 ASSERT_TRUE(extension);	212 ASSERT_TRUE(extension);

213 CheckPluginsCreated(url, PLUGIN_TYPE_ALL);	213 CheckPluginsCreated(url, PLUGIN_TYPE_ALL);

214 }	214 }

215	215

216 } // namespace	216 } // namespace

OLD	NEW