OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/shell.h" | 5 #include "ash/shell.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/app_list/app_list.h" | 9 #include "ash/app_list/app_list.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 std::string* toup_url) OVERRIDE { | 482 std::string* toup_url) OVERRIDE { |
483 return false; | 483 return false; |
484 } | 484 } |
485 | 485 |
486 virtual void ShowCellularTopupURL(const std::string& topup_url) OVERRIDE { | 486 virtual void ShowCellularTopupURL(const std::string& topup_url) OVERRIDE { |
487 } | 487 } |
488 | 488 |
489 virtual void ChangeProxySettings() OVERRIDE { | 489 virtual void ChangeProxySettings() OVERRIDE { |
490 } | 490 } |
491 | 491 |
| 492 virtual void OnTrayDestroyed() OVERRIDE { |
| 493 } |
| 494 |
492 bool muted_; | 495 bool muted_; |
493 bool wifi_enabled_; | 496 bool wifi_enabled_; |
494 bool cellular_enabled_; | 497 bool cellular_enabled_; |
495 bool bluetooth_enabled_; | 498 bool bluetooth_enabled_; |
496 float volume_; | 499 float volume_; |
497 SkBitmap null_image_; | 500 SkBitmap null_image_; |
498 | 501 |
499 DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate); | 502 DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate); |
500 }; | 503 }; |
501 | 504 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 // These need a valid Shell instance to clean up properly, so explicitly | 585 // These need a valid Shell instance to clean up properly, so explicitly |
583 // delete them before invalidating the instance. | 586 // delete them before invalidating the instance. |
584 // Alphabetical. | 587 // Alphabetical. |
585 activation_controller_.reset(); | 588 activation_controller_.reset(); |
586 drag_drop_controller_.reset(); | 589 drag_drop_controller_.reset(); |
587 resize_shadow_controller_.reset(); | 590 resize_shadow_controller_.reset(); |
588 shadow_controller_.reset(); | 591 shadow_controller_.reset(); |
589 window_cycle_controller_.reset(); | 592 window_cycle_controller_.reset(); |
590 event_client_.reset(); | 593 event_client_.reset(); |
591 monitor_controller_.reset(); | 594 monitor_controller_.reset(); |
| 595 tooltip_controller_.reset(); |
592 | 596 |
593 // Launcher widget has a InputMethodBridge that references to | 597 // Launcher widget has a InputMethodBridge that references to |
594 // input_method_filter_'s input_method_. So explicitly release launcher_ | 598 // input_method_filter_'s input_method_. So explicitly release launcher_ |
595 // before input_method_filter_. And this needs to be after we delete all | 599 // before input_method_filter_. And this needs to be after we delete all |
596 // containers in case there are still live browser windows which access | 600 // containers in case there are still live browser windows which access |
597 // LauncherModel during close. | 601 // LauncherModel during close. |
598 launcher_.reset(); | 602 launcher_.reset(); |
599 | 603 |
600 DCHECK(instance_ == this); | 604 DCHECK(instance_ == this); |
601 instance_ = NULL; | 605 instance_ = NULL; |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
931 // Create desktop background widget. | 935 // Create desktop background widget. |
932 desktop_background_controller_->SetDesktopBackgroundImageMode(); | 936 desktop_background_controller_->SetDesktopBackgroundImageMode(); |
933 } | 937 } |
934 | 938 |
935 void Shell::DisableWorkspaceGridLayout() { | 939 void Shell::DisableWorkspaceGridLayout() { |
936 if (workspace_controller_.get()) | 940 if (workspace_controller_.get()) |
937 workspace_controller_->workspace_manager()->set_grid_size(0); | 941 workspace_controller_->workspace_manager()->set_grid_size(0); |
938 } | 942 } |
939 | 943 |
940 } // namespace ash | 944 } // namespace ash |
OLD | NEW |