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

Unified Diff: ash/shell.h

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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 0b656e29272e3a118423c2d9f29aa9dca0b48904..c674dd70b7c7f6446941e9e4abc1f7d75f3961e6 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -130,6 +130,7 @@ class ProjectingObserver;
class ResizeShadowController;
class ResolutionNotificationController;
class RootWindowController;
+class ShellPort;
class ScopedOverviewAnimationSettingsFactoryAura;
class ScreenLayoutObserver;
class ScreenOrientationController;
@@ -169,7 +170,6 @@ class WindowCycleController;
class WindowPositioner;
class WindowSelectorController;
class WindowTreeHostManager;
-class WmShell;
class WmWindow;
enum class Config;
@@ -598,7 +598,7 @@ class ASH_EXPORT Shell : public SessionStateObserver,
friend class shell::WindowWatcher;
Shell(std::unique_ptr<ShellDelegate> shell_delegate,
- std::unique_ptr<WmShell> wm_shell);
+ std::unique_ptr<ShellPort> shell_port);
~Shell() override;
void Init(const ShellInitParams& init_params);
@@ -651,7 +651,7 @@ class ASH_EXPORT Shell : public SessionStateObserver,
std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura>
scoped_overview_animation_settings_factory_;
- std::unique_ptr<WmShell> wm_shell_;
+ std::unique_ptr<ShellPort> shell_port_;
// The CompoundEventFilter owned by aura::Env object.
std::unique_ptr<::wm::CompoundEventFilter> env_filter_;

Powered by Google App Engine
This is Rietveld 408576698