| Index: ash/wm/maximize_mode/maximize_mode_controller.cc
|
| diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc
|
| index 2cc2fcf55d6cc32f72dbda4cbd6e1dff9ce283af..5f4b32a429f9d460287b3e8a53f63b976c8c8667 100644
|
| --- a/ash/wm/maximize_mode/maximize_mode_controller.cc
|
| +++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
|
| @@ -108,9 +108,7 @@ MaximizeModeController::MaximizeModeController()
|
| #endif
|
| lid_is_closed_(false) {
|
| WmShell::Get()->AddShellObserver(this);
|
| - Shell* shell = Shell::GetInstance();
|
| - shell->metrics()->RecordUserMetricsAction(
|
| - ash::UMA_MAXIMIZE_MODE_INITIALLY_DISABLED);
|
| + WmShell::Get()->RecordUserMetricsAction(UMA_MAXIMIZE_MODE_INITIALLY_DISABLED);
|
|
|
| #if defined(OS_CHROMEOS)
|
| // TODO(jonross): Do not create MaximizeModeController if the flag is
|
| @@ -120,7 +118,7 @@ MaximizeModeController::MaximizeModeController()
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kAshEnableTouchView)) {
|
| chromeos::AccelerometerReader::GetInstance()->AddObserver(this);
|
| - shell->window_tree_host_manager()->AddObserver(this);
|
| + Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
|
| }
|
| chromeos::DBusThreadManager::Get()->
|
| GetPowerManagerClient()->AddObserver(this);
|
| @@ -168,11 +166,11 @@ void MaximizeModeController::EnableMaximizeModeWindowManager(
|
| maximize_mode_window_manager_.reset(new MaximizeModeWindowManager());
|
| // TODO(jonross): Move the maximize mode notifications from ShellObserver
|
| // to MaximizeModeController::Observer
|
| - shell->metrics()->RecordUserMetricsAction(ash::UMA_MAXIMIZE_MODE_ENABLED);
|
| + WmShell::Get()->RecordUserMetricsAction(UMA_MAXIMIZE_MODE_ENABLED);
|
| shell->OnMaximizeModeStarted();
|
| } else {
|
| maximize_mode_window_manager_.reset();
|
| - shell->metrics()->RecordUserMetricsAction(ash::UMA_MAXIMIZE_MODE_DISABLED);
|
| + WmShell::Get()->RecordUserMetricsAction(UMA_MAXIMIZE_MODE_DISABLED);
|
| shell->OnMaximizeModeEnded();
|
| }
|
| }
|
|
|