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

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

Unified Diff: content/shell/shell_aura.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:

Index: content/shell/shell_aura.cc

diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc

index 06fcaa02ca7489e72fe25724a2b43d3bf3c873e9..2bae9a73a7bcc57c9431c2a3b2505e867c4f38f6 100644

--- a/content/shell/shell_aura.cc

+++ b/content/shell/shell_aura.cc

@@ -5,7 +5,7 @@

#include "content/shell/shell.h"

#include "base/command_line.h"

-#include "base/utf_string_conversions.h"

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

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_view.h"

#include "ui/aura/env.h"

@@ -22,8 +22,8 @@

#include "ui/views/controls/webview/webview.h"

#include "ui/views/layout/fill_layout.h"

#include "ui/views/layout/grid_layout.h"

-#include "ui/views/view.h"

#include "ui/views/test/desktop_test_views_delegate.h"

+#include "ui/views/view.h"

#include "ui/views/widget/desktop_aura/desktop_screen.h"

#include "ui/views/widget/widget.h"

#include "ui/views/widget/widget_delegate.h"

« no previous file with comments | « content/shell/shell.cc ('k') | content/shell/shell_browser_main.cc » ('j') | no next file with comments »