| Index: ash/shell/shell_main.cc
|
| diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
|
| index ada50274bb75461b956d93c21dc4221f5a4bea57..c1c6d83efa0668da8803b43f0846d34568f0ac31 100644
|
| --- a/ash/shell/shell_main.cc
|
| +++ b/ash/shell/shell_main.cc
|
| @@ -183,8 +183,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
| }
|
|
|
| std::vector<aura::Window*> GetCycleWindowList(
|
| - CycleSource source,
|
| - CycleOrder order) const OVERRIDE {
|
| + CycleSource source) const OVERRIDE {
|
| aura::Window* default_container = ash::Shell::GetInstance()->GetContainer(
|
| ash::internal::kShellWindowId_DefaultContainer);
|
| std::vector<aura::Window*> windows = default_container->children();
|
| @@ -209,11 +208,6 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
| return NULL;
|
| }
|
|
|
| - virtual bool GetOverrideWindowMode(
|
| - ash::Shell::WindowMode* window_mode) OVERRIDE {
|
| - return false;
|
| - }
|
| -
|
| private:
|
| // Used to update Launcher. Owned by main.
|
| WindowWatcher* watcher_;
|
|
|