chrome/browser/ui/views/frame/browser_view.cc - Issue 9390038: Move automation/ui_controls to ui/ui_controls

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/ui/views/frame/browser_view.cc

Issue 9390038: Move automation/ui_controls to ui/ui_controls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: win_aura fix, sync Created 8 years, 9 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: chrome/browser/ui/views/frame/browser_view.cc

diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc

index 6cb2c032dda207c7362df134b0e207fe3a5d0567..b0f0f9428d495151f4285a0432fb410e3b1a9c45 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -20,7 +20,6 @@

#include "chrome/app/chrome_dll_resource.h"

#include "chrome/browser/autocomplete/autocomplete_popup_model.h"

#include "chrome/browser/autocomplete/autocomplete_popup_view.h"

-#include "chrome/browser/automation/ui_controls.h"

#include "chrome/browser/bookmarks/bookmark_utils.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/debugger/devtools_window.h"

@@ -93,6 +92,7 @@

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

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/canvas.h"

+#include "ui/ui_controls/ui_controls.h"

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

#include "ui/views/events/event.h"

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