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

Unified Diff: ash/shell.cc

Issue 10263015: ash: Resize PowerButtonController background layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 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
« no previous file with comments | « no previous file | ash/wm/power_button_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 3aab8a54b33008cac7312bdc8d7b4f9e86039edb..d025e4d17520b803eaaeef575dae7852f1f8d76f 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -574,14 +574,15 @@ Shell::~Shell() {
// Alphabetical.
activation_controller_.reset();
drag_drop_controller_.reset();
+ event_client_.reset();
magnification_controller_.reset();
+ monitor_controller_.reset();
+ power_button_controller_.reset();
resize_shadow_controller_.reset();
screen_dimmer_.reset();
shadow_controller_.reset();
- window_cycle_controller_.reset();
- event_client_.reset();
- monitor_controller_.reset();
tooltip_controller_.reset();
+ window_cycle_controller_.reset();
// Launcher widget has a InputMethodBridge that references to
// input_method_filter_'s input_method_. So explicitly release launcher_
« no previous file with comments | « no previous file | ash/wm/power_button_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698