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

Unified Diff: ash/shell.h

Issue 2115663002: Folds methods in WmShellCommon to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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/shelf/shelf_layout_manager.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 e30da16f4d24e35e0abed47b86c3c3248e909c05..6676f29fabacfe309cbedc2d859fb5e4b6d4f5a9 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -11,7 +11,6 @@
#include "ash/ash_export.h"
#include "ash/common/shelf/shelf_types.h"
-#include "ash/common/wm_shell_common.h"
#include "ash/metrics/user_metrics_recorder.h"
#include "ash/wm/cursor_manager_chromeos.h"
#include "ash/wm/system_modal_container_event_filter_delegate.h"
@@ -111,7 +110,6 @@ class MagnificationController;
class MaximizeModeController;
class MaximizeModeWindowManager;
class MouseCursorEventFilter;
-class MruWindowTracker;
class NewWindowDelegate;
class OverlayEventFilter;
class PartialMagnificationController;
@@ -348,9 +346,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
LockStateController* lock_state_controller() {
return lock_state_controller_.get();
}
- MruWindowTracker* mru_window_tracker() {
- return wm_shell_common_->mru_window_tracker();
- }
VideoDetector* video_detector() { return video_detector_.get(); }
WindowCycleController* window_cycle_controller() {
return window_cycle_controller_.get();
@@ -593,7 +588,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura>
scoped_overview_animation_settings_factory_;
- std::unique_ptr<WmShellCommon> wm_shell_common_;
std::unique_ptr<WmShellAura> wm_shell_;
// When no explicit target display/RootWindow is given, new windows are
« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698