chrome/browser/instant/instant_controller.cc - Issue 8742030: views: Move view.h to ui/views/.

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: chrome/browser/instant/instant_controller.cc

Issue 8742030: views: Move view.h to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase and fix conflicts Created 9 years, 1 month 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: chrome/browser/instant/instant_controller.cc

diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc

index d4d3078e28dfbc55b4bc07d0d259458060d90cd1..b1396f6ed5e9742abacdb5cb8ac62a6c24840e05 100644

--- a/chrome/browser/instant/instant_controller.cc

+++ b/chrome/browser/instant/instant_controller.cc

@@ -32,8 +32,8 @@

#if defined(TOOLKIT_VIEWS)

#include "ui/views/focus/focus_manager.h"

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

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

-#include "views/view.h"

#endif

InstantController::InstantController(Profile* profile,