views/controls/menu/menu_controller.cc - Issue 8598031: views: Move widget/ directory 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: views/controls/menu/menu_controller.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: reland for real 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: views/controls/menu/menu_controller.cc

diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc

index 37b98b12008fc43889b568987dfc4bd34f5ffca4..90dd6b278980245cd2665c9a4cf4cfb740d2c9f3 100644

--- a/views/controls/menu/menu_controller.cc

+++ b/views/controls/menu/menu_controller.cc

@@ -14,6 +14,8 @@

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

#include "ui/gfx/canvas_skia.h"

#include "ui/gfx/screen.h"

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

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

#include "views/controls/button/menu_button.h"

#include "views/controls/menu/menu_controller_delegate.h"

#include "views/controls/menu/menu_scroll_view_container.h"

@@ -21,8 +23,6 @@

#include "views/drag_utils.h"

#include "views/view_constants.h"

#include "views/views_delegate.h"

-#include "views/widget/root_view.h"

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

#if defined(USE_AURA)

#include "ui/aura/desktop.h"

« no previous file with comments | « views/controls/combobox/native_combobox_win.cc ('k') | views/controls/menu/menu_host.h » ('j') | no next file with comments »