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

Unified Diff: ash/shell.h

Issue 1684823004: Refactors keyboard related code so mash can use a keyboard (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn Created 4 years, 10 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
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index a8d4e7591fd6e494f140c89c0842261f927311ec..680f8a1e62897e6b72595947626c726485105e81 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -98,6 +98,7 @@ class FirstRunHelper;
class FocusCycler;
class GPUSupport;
class HighContrastController;
+class KeyboardUI;
class KeyboardUMAEventFilter;
class LastWindowClosedLogoutReminder;
class LocaleNotificationController;
@@ -564,6 +565,10 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return is_touch_hud_projection_enabled_;
}
+ KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
+
+ bool in_mus() const { return in_mus_; }
+
#if defined(OS_CHROMEOS)
// Creates instance of FirstRunHelper. Caller is responsible for deleting
// returned object.
@@ -766,6 +771,10 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
base::SequencedWorkerPool* blocking_pool_;
+ bool in_mus_ = false;
+
+ scoped_ptr<KeyboardUI> keyboard_ui_;
+
DISALLOW_COPY_AND_ASSIGN(Shell);
};
« ash/mus/sysui_application.cc ('K') | « ash/mus/sysui_application.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698