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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/system/chromeos/brightness/tray_brightness.cc

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)
Patch Set: Created 3 years, 9 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
« ash/accelerators/accelerator_interactive_uitest_chromeos.cc ('K') | « ash/common/shelf/wm_shelf.cc ('k') | ash/common/system/chromeos/cast/tray_cast.cc » ('j') | ash/high_contrast/high_contrast_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/brightness/tray_brightness.cc
diff --git a/ash/common/system/chromeos/brightness/tray_brightness.cc b/ash/common/system/chromeos/brightness/tray_brightness.cc
index dc097566dc574cb3fd03e3351b9d3cbd0b141661..c67af999c5cc3670f64d8ebfaed1ab7a0ab5a9af 100644
--- a/ash/common/system/chromeos/brightness/tray_brightness.cc
+++ b/ash/common/system/chromeos/brightness/tray_brightness.cc
@@ -16,6 +16,7 @@
#include "ash/common/wm_shell.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
@@ -118,7 +119,7 @@ BrightnessView::BrightnessView(bool default_view, double initial_percent)
tri_view->AddView(TriView::Container::CENTER, slider_);
if (is_default_view_) {
- WmShell::Get()->AddShellObserver(this);
+ Shell::GetInstance()->AddShellObserver(this);
SetVisible(WmShell::Get()
->maximize_mode_controller()
->IsMaximizeModeWindowManagerEnabled());
@@ -129,7 +130,7 @@ BrightnessView::BrightnessView(bool default_view, double initial_percent)
BrightnessView::~BrightnessView() {
if (is_default_view_)
- WmShell::Get()->RemoveShellObserver(this);
+ Shell::GetInstance()->RemoveShellObserver(this);
}
void BrightnessView::SetBrightnessPercent(double percent) {
« ash/accelerators/accelerator_interactive_uitest_chromeos.cc ('K') | « ash/common/shelf/wm_shelf.cc ('k') | ash/common/system/chromeos/cast/tray_cast.cc » ('j') | ash/high_contrast/high_contrast_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698