chrome/browser/chromeos/login/screen_locker_browsertest.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/chromeos/login/screen_locker_browsertest.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/chromeos/login/screen_locker_browsertest.cc

diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc

index 06b3608fe1e18271e7204c47dd6d66cf39120cdf..594f7fc9719c1284fc190d06b3b5d7fe099f73d3 100644

--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc

+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc

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

#include "base/command_line.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop.h"

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

#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"

#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"

#include "chrome/browser/chromeos/dbus/mock_power_manager_client.h"

@@ -23,6 +22,7 @@

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

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

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

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

#if defined(TOOLKIT_USES_GTK)