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

Unified Diff: ui/keyboard/keyboard_util.h

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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/keyboard/keyboard_ui_handler.cc ('k') | ui/keyboard/keyboard_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_util.h
diff --git a/ui/keyboard/keyboard_util.h b/ui/keyboard/keyboard_util.h
index 4797406be1c470d3babf14b31677558a47635b3b..32f9204078bcb2de268f5ae53498b8ac4fd423d5 100644
--- a/ui/keyboard/keyboard_util.h
+++ b/ui/keyboard/keyboard_util.h
@@ -8,11 +8,10 @@
#include <string>
#include "base/strings/string16.h"
+// TODO(beng): replace with forward decl once RootWindow is renamed.
+#include "ui/aura/window.h"
#include "ui/keyboard/keyboard_export.h"
-namespace aura {
-class RootWindow;
-}
struct GritResourceMap;
namespace keyboard {
@@ -41,13 +40,13 @@ KEYBOARD_EXPORT bool IsKeyboardEnabled();
// that this may convert |text| into ui::KeyEvents for injection in some
// special circumstances (i.e. VKEY_RETURN, VKEY_BACK).
KEYBOARD_EXPORT bool InsertText(const base::string16& text,
- aura::RootWindow* root_window);
+ aura::Window* root_window);
// Move cursor when swipe on the virtualkeyboard. Returns true if cursor was
// successfully moved according to |swipe_direction|.
KEYBOARD_EXPORT bool MoveCursor(int swipe_direction,
int modifier_flags,
- aura::RootWindow* root_window);
+ aura::WindowEventDispatcher* dispatcher);
// Sends a fabricated key event, where |type| is the event type, |key_value|
// is the unicode value of the character, |key_code| is the legacy key code
@@ -58,7 +57,7 @@ KEYBOARD_EXPORT bool SendKeyEvent(std::string type,
int key_value,
int key_code,
bool shift_modifier,
- aura::RootWindow* root_window);
+ aura::WindowEventDispatcher* dispatcher);
// Get the list of keyboard resources. |size| is populated with the number of
// resources in the returned array.
« no previous file with comments | « ui/keyboard/keyboard_ui_handler.cc ('k') | ui/keyboard/keyboard_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698