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

Unified Diff: ui/aura/desktop.h

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git mv desktop_host_unittest.cc desktop_host_ime_unittest.cc 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:
View side-by-side diff with in-line comments
Download patch
Index: ui/aura/desktop.h
diff --git a/ui/aura/desktop.h b/ui/aura/desktop.h
index df12a6cd4f21008e2c2c97eac5f88adb0fdad228..181a80015f5f7e8118514050c11016bbdfb25ae9 100644
--- a/ui/aura/desktop.h
+++ b/ui/aura/desktop.h
@@ -26,12 +26,17 @@ class Size;
}
namespace ui {
+class InputMethod;
class LayerAnimationSequence;
class Transform;
}
namespace aura {
+namespace test {
+class DesktopHostIMETest;
+} // namespace test
+
class DesktopHost;
class DesktopObserver;
class KeyEvent;
@@ -145,12 +150,17 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate,
// Overridden from Window:
virtual void SetTransform(const ui::Transform& transform) OVERRIDE;
+ // Gets the input method for the desktop.
+ ui::InputMethod* GetInputMethod();
+
#if !defined(NDEBUG)
// Toggles the host's full screen state.
void ToggleFullScreen();
#endif
private:
+ friend class aura::test::DesktopHostIMETest; // need to access |host_|.
+
Desktop();
virtual ~Desktop();

Powered by Google App Engine
This is Rietveld 408576698