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

Unified Diff: ash/shell.h

Issue 2103053004: mash: Convert virtual keyboard system tray item to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/common/wm_shell.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index b960918ca943631498c22d14a7bdb2268db9c700..8aed464df31f2ceabfcf3586b011ddf0b009a971 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -102,7 +102,6 @@ class EventTransformationHandler;
class FirstRunHelper;
class GPUSupport;
class HighContrastController;
-class KeyboardUI;
class KeyboardUMAEventFilter;
class LinkHandlerModelFactory;
class LocaleNotificationController;
@@ -521,8 +520,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return is_touch_hud_projection_enabled_;
}
- KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
-
// TODO(sky): remove this. This was needed by sysui, but as sysui is going
// away it should no longer be needed.
bool in_mus() const { return in_mus_; }
@@ -736,8 +733,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
bool in_mus_ = false;
- std::unique_ptr<KeyboardUI> keyboard_ui_;
-
DISALLOW_COPY_AND_ASSIGN(Shell);
};
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698