content/browser/web_contents/web_contents_impl.cc - Issue 10351002: ui: Move surface/ directory out of gfx/, up to ui/.

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/browser/web_contents/web_contents_impl.cc

Issue 10351002: ui: Move surface/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix gpu DEPS Created 8 years, 8 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/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 05dafcd5a03c47149959973c9ea7ad5ec9ee9b18..fc024bfd01354499d5830d6d718656224e63a43a 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -58,14 +58,14 @@

#include "content/public/common/content_restriction.h"

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

#include "content/public/common/url_constants.h"

-#include "ui/base/ui_base_switches.h"

-#include "ui/gfx/monitor.h"

-#include "ui/gfx/screen.h"

#include "net/base/mime_util.h"

#include "net/base/net_util.h"

#include "net/base/network_change_notifier.h"

#include "net/url_request/url_request_context_getter.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

+#include "ui/base/ui_base_switches.h"

+#include "ui/gfx/monitor.h"

+#include "ui/gfx/screen.h"

#include "webkit/glue/web_intent_data.h"

#include "webkit/glue/webpreferences.h"

@@ -77,7 +77,7 @@

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

#elif defined(OS_MACOSX)

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

-#include "ui/gfx/surface/io_surface_support_mac.h"

+#include "ui/surface/io_surface_support_mac.h"

#elif defined(OS_ANDROID)

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

#endif