| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h" | 5 #include "chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h" |
| 6 | 6 |
| 7 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 7 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 8 #include "ash/common/wm_shell.h" | 8 #include "ash/common/wm_shell.h" |
| 9 #include "ash/shell.h" | |
| 10 | 9 |
| 11 namespace chromeos { | 10 namespace chromeos { |
| 12 | 11 |
| 13 TouchViewControllerDelegate::TouchViewControllerDelegate() { | 12 TouchViewControllerDelegate::TouchViewControllerDelegate() { |
| 14 ash::WmShell::Get()->AddShellObserver(this); | 13 ash::WmShell::Get()->AddShellObserver(this); |
| 15 } | 14 } |
| 16 | 15 |
| 17 TouchViewControllerDelegate::~TouchViewControllerDelegate() { | 16 TouchViewControllerDelegate::~TouchViewControllerDelegate() { |
| 18 ash::WmShell::Get()->RemoveShellObserver(this); | 17 ash::WmShell::Get()->RemoveShellObserver(this); |
| 19 } | 18 } |
| 20 | 19 |
| 21 void TouchViewControllerDelegate::AddObserver(Observer* observer) { | 20 void TouchViewControllerDelegate::AddObserver(Observer* observer) { |
| 22 observers_.AddObserver(observer); | 21 observers_.AddObserver(observer); |
| 23 } | 22 } |
| 24 | 23 |
| 25 void TouchViewControllerDelegate::RemoveObserver(Observer* observer) { | 24 void TouchViewControllerDelegate::RemoveObserver(Observer* observer) { |
| 26 observers_.RemoveObserver(observer); | 25 observers_.RemoveObserver(observer); |
| 27 } | 26 } |
| 28 | 27 |
| 29 bool TouchViewControllerDelegate::IsMaximizeModeEnabled() const { | 28 bool TouchViewControllerDelegate::IsMaximizeModeEnabled() const { |
| 30 return ash::Shell::GetInstance()->maximize_mode_controller()-> | 29 return ash::WmShell::Get() |
| 31 IsMaximizeModeWindowManagerEnabled(); | 30 ->maximize_mode_controller() |
| 31 ->IsMaximizeModeWindowManagerEnabled(); |
| 32 } | 32 } |
| 33 | 33 |
| 34 void TouchViewControllerDelegate::OnMaximizeModeStarted() { | 34 void TouchViewControllerDelegate::OnMaximizeModeStarted() { |
| 35 FOR_EACH_OBSERVER(Observer, observers_, OnMaximizeModeStarted()); | 35 FOR_EACH_OBSERVER(Observer, observers_, OnMaximizeModeStarted()); |
| 36 } | 36 } |
| 37 | 37 |
| 38 void TouchViewControllerDelegate::OnMaximizeModeEnded() { | 38 void TouchViewControllerDelegate::OnMaximizeModeEnded() { |
| 39 FOR_EACH_OBSERVER(Observer, observers_, OnMaximizeModeEnded()); | 39 FOR_EACH_OBSERVER(Observer, observers_, OnMaximizeModeEnded()); |
| 40 } | 40 } |
| 41 | 41 |
| 42 } // namespace chromeos | 42 } // namespace chromeos |
| OLD | NEW |