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

Unified Diff: ash/display/virtual_keyboard_window_controller.h

Issue 273073002: Changes code using Compositor to pass in ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tooltip on chromeos Created 6 years, 7 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 | « ash/display/mirror_window_controller.cc ('k') | ash/display/virtual_keyboard_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/virtual_keyboard_window_controller.h
diff --git a/ash/display/virtual_keyboard_window_controller.h b/ash/display/virtual_keyboard_window_controller.h
index 23dd40635761932207ae0f6547d09a53bab19127..d864a20404bac9775b8bf34806112f4aabe01040 100644
--- a/ash/display/virtual_keyboard_window_controller.h
+++ b/ash/display/virtual_keyboard_window_controller.h
@@ -15,6 +15,10 @@ namespace keyboard {
class KeyboardController;
}
+namespace ui {
+class ContextFactory;
+}
+
namespace ash {
class DisplayInfo;
class RootWindowController;
@@ -27,7 +31,7 @@ class VirtualKeyboardWindowControllerTest;
// virtual keyboard.
class ASH_EXPORT VirtualKeyboardWindowController : public ShellObserver {
public:
- VirtualKeyboardWindowController();
+ explicit VirtualKeyboardWindowController(ui::ContextFactory* context_factory);
virtual ~VirtualKeyboardWindowController();
void ActivateKeyboard(keyboard::KeyboardController* keyboard_controller);
@@ -53,6 +57,8 @@ class ASH_EXPORT VirtualKeyboardWindowController : public ShellObserver {
return root_window_controller_.get();
}
+ ui::ContextFactory* context_factory_;
+
scoped_ptr<RootWindowController> root_window_controller_;
DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardWindowController);
« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ash/display/virtual_keyboard_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698