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

Unified Diff: ash/shell.h

Issue 2611253002: Removes some dead code (Closed)
Patch Set: merge Created 3 years, 11 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/mus/bridge/wm_root_window_controller_mus.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 c36f994285413f147a4d22540127e704aa051b26..f1db84e7650426c19b292587b1950ca02088e9d1 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -21,8 +21,6 @@
#include "ui/aura/window.h"
#include "ui/display/screen.h"
#include "ui/events/event_target.h"
-#include "ui/gfx/geometry/insets.h"
-#include "ui/gfx/geometry/size.h"
#include "ui/wm/core/cursor_manager.h"
namespace aura {
@@ -44,7 +42,7 @@ class DisplayManager;
}
namespace gfx {
-class Rect;
+class Insets;
}
namespace ui {
@@ -398,8 +396,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
friend class test::ShellTestApi;
friend class shell::WindowWatcher;
- typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
-
// Takes ownership of |delegate|.
explicit Shell(ShellDelegate* delegate);
~Shell() override;
@@ -434,8 +430,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// The CompoundEventFilter owned by aura::Env object.
std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
- std::vector<WindowAndBoundsPair> to_restore_;
-
std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
std::unique_ptr<AcceleratorControllerDelegateAura>
accelerator_controller_delegate_;
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698