Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: ui/ui_controls/ui_controls_internal_win.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ui_controls/ui_controls_internal_win.h ('k') | ui/ui_controls/ui_controls_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui_controls/ui_controls_internal_win.cc
diff --git a/chrome/browser/automation/ui_controls_internal_win.cc b/ui/ui_controls/ui_controls_internal_win.cc
similarity index 97%
rename from chrome/browser/automation/ui_controls_internal_win.cc
rename to ui/ui_controls/ui_controls_internal_win.cc
index 34e7646aa5a3c15b44dc7082f475efe1f5c5d2f4..37e0d1aa713b39c9a0812a6f1a7bc35576ca87b5 100644
--- a/chrome/browser/automation/ui_controls_internal_win.cc
+++ b/ui/ui_controls/ui_controls_internal_win.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/automation/ui_controls_internal.h"
+#include "ui/ui_controls/ui_controls_internal_win.h"
#include "base/bind.h"
#include "base/callback.h"
@@ -171,7 +171,7 @@ bool SendKeyEvent(ui::KeyboardCode key, bool up) {
namespace ui_controls {
namespace internal {
-bool SendKeyPressImpl(gfx::NativeWindow native_window,
+bool SendKeyPressImpl(HWND window,
ui::KeyboardCode key,
bool control,
bool shift,
@@ -179,11 +179,6 @@ bool SendKeyPressImpl(gfx::NativeWindow native_window,
const base::Closure& task) {
// SendInput only works as we expect it if one of our windows is the
// foreground window already.
-#if defined(USE_AURA)
- HWND window = native_window->GetRootWindow()->GetAcceleratedWidget();
-#else
- HWND window = native_window;
-#endif
HWND target_window = (::GetActiveWindow() &&
::GetWindow(::GetActiveWindow(), GW_OWNER) == window) ?
::GetActiveWindow() :
« no previous file with comments | « ui/ui_controls/ui_controls_internal_win.h ('k') | ui/ui_controls/ui_controls_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698