Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 0d30ef1ea8354ed63b16105f2e57da480af6c0c5..dee0233d0a4aabce2c954c48df08eebf1b0db6c7 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -489,6 +489,9 @@ class DummySystemTrayDelegate : public SystemTrayDelegate { |
virtual void ChangeProxySettings() OVERRIDE { |
} |
+ virtual void OnTrayDestroyed() OVERRIDE { |
+ } |
+ |
bool muted_; |
bool wifi_enabled_; |
bool cellular_enabled_; |
@@ -589,6 +592,7 @@ Shell::~Shell() { |
window_cycle_controller_.reset(); |
event_client_.reset(); |
monitor_controller_.reset(); |
+ tooltip_controller_.reset(); |
// Launcher widget has a InputMethodBridge that references to |
// input_method_filter_'s input_method_. So explicitly release launcher_ |