Cleanup athena's WindowManagerImpl

athena/wm/window_manager_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/wm/public/window_manager.h"
 
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/wm/public/window_manager_observer.h"
 #include "athena/wm/window_overview_mode.h"
@@ skipping 10 matching lines @@
                           public WindowOverviewModeDelegate,
                           public aura::WindowObserver,
                           public AcceleratorHandler {
  public:
   WindowManagerImpl();
   virtual ~WindowManagerImpl();
 
   void Layout();
 
   // WindowManager:
-  virtual void ToggleOverview() OVERRIDE {
-    if (overview_) {
-      overview_.reset();
-      FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
-                        OnOverviewModeExit());
-    } else {
-      overview_ = WindowOverviewMode::Create(container_.get(), this);
-      FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
-                        OnOverviewModeEnter());
-    }
-  }
+  virtual void ToggleOverview() OVERRIDE;
 
  private:
   enum Command {
     COMMAND_TOGGLE_OVERVIEW,
   };
 
-  void InstallAccelerators() {
-    const AcceleratorData accelerator_data[] = {
-        {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_NONE, COMMAND_TOGGLE_OVERVIEW,
-         AF_NONE},
-    };
-    AcceleratorManager::Get()->RegisterAccelerators(
-        accelerator_data, arraysize(accelerator_data), this);
-  }
+  void InstallAccelerators();
 
   // WindowManager:
-  virtual void AddObserver(WindowManagerObserver* observer) OVERRIDE {
-    observers_.AddObserver(observer);
-  }
-
-  virtual void RemoveObserver(WindowManagerObserver* observer) OVERRIDE {
-    observers_.RemoveObserver(observer);
-  }
+  virtual void AddObserver(WindowManagerObserver* observer) OVERRIDE;
+  virtual void RemoveObserver(WindowManagerObserver* observer) OVERRIDE;
 
   // WindowOverviewModeDelegate:
-  virtual void OnSelectWindow(aura::Window* window) OVERRIDE {
-    CHECK_EQ(container_.get(), window->parent());
-    container_->StackChildAtTop(window);
-    overview_.reset();
-    FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
-                      OnOverviewModeExit());
-  }
+  virtual void OnSelectWindow(aura::Window* window) OVERRIDE;
 
   // aura::WindowObserver
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {
-    if (window == container_)
-      container_.reset();
-  }
+  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   // AcceleratorHandler:
-  virtual bool IsCommandEnabled(int command_id) const OVERRIDE { return true; }
+  virtual bool IsCommandEnabled(int command_id) const OVERRIDE;
   virtual bool OnAcceleratorFired(int command_id,
-                                  const ui::Accelerator& accelerator) OVERRIDE {
-    switch (command_id) {
-      case COMMAND_TOGGLE_OVERVIEW:
-        ToggleOverview();
-        break;
-    }
-    return true;
-  }
+                                  const ui::Accelerator& accelerator) OVERRIDE;
 
   scoped_ptr<aura::Window> container_;
   scoped_ptr<WindowOverviewMode> overview_;
   ObserverList<WindowManagerObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
 };
 
 class WindowManagerImpl* instance = NULL;
 
 class AthenaContainerLayoutManager : public aura::LayoutManager {

[flackr, 2014/07/23 02:34:19]

Can you move this class so the implementation immediately follows the
declaration? I guess up since WindowManagerImpl::WindowManagerImpl constructs
this.

[pkotwicz, 2014/07/23 04:25:36]

WindowManagerImpl uses AthenaContainerLayoutManager so it isn't that simple

I moved the implementation of AthenaContainerLayoutManager out of the class'
declaration and now everything is groovy

  public:
   AthenaContainerLayoutManager() {}
   virtual ~AthenaContainerLayoutManager() {}
 
  private:
   // aura::LayoutManager:
   virtual void OnWindowResized() OVERRIDE { instance->Layout(); }
   virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
     instance->Layout();
   }
@@ skipping 38 matching lines @@
   const aura::Window::Windows& children = container_->children();
   for (aura::Window::Windows::const_iterator iter = children.begin();
        iter != children.end();
        ++iter) {
     if ((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL ||
         (*iter)->type() == ui::wm::WINDOW_TYPE_POPUP)
       (*iter)->SetBounds(bounds);
   }
 }
 
+void WindowManagerImpl::ToggleOverview() {
+  if (overview_) {
+    overview_.reset();
+    FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
+                      OnOverviewModeExit());
+  } else {
+    overview_ = WindowOverviewMode::Create(container_.get(), this);
+    FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
+                      OnOverviewModeEnter());
+  }
+}
+
+void WindowManagerImpl::InstallAccelerators() {
+  const AcceleratorData accelerator_data[] = {
+      {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_NONE, COMMAND_TOGGLE_OVERVIEW,
+       AF_NONE},
+  };
+  AcceleratorManager::Get()->RegisterAccelerators(
+      accelerator_data, arraysize(accelerator_data), this);
+}
+
+void WindowManagerImpl::AddObserver(WindowManagerObserver* observer) {
+  observers_.AddObserver(observer);
+}
+
+void WindowManagerImpl::RemoveObserver(WindowManagerObserver* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+void WindowManagerImpl::OnSelectWindow(aura::Window* window) {
+  CHECK_EQ(container_.get(), window->parent());
+  container_->StackChildAtTop(window);
+  overview_.reset();
+  FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
+                    OnOverviewModeExit());
+}
+
+void WindowManagerImpl::OnWindowDestroying(aura::Window* window) {
+  if (window == container_)
+    container_.reset();
+}
+
+bool WindowManagerImpl::IsCommandEnabled(int command_id) const {
+  return true;
+}
+
+bool WindowManagerImpl::OnAcceleratorFired(int command_id,
+                                           const ui::Accelerator& accelerator) {
+  switch (command_id) {
+    case COMMAND_TOGGLE_OVERVIEW:
+      ToggleOverview();
+      break;
+  }
+  return true;
+}
+
 }  // namespace
 
 // static
 WindowManager* WindowManager::Create() {
   DCHECK(!instance);
   new WindowManagerImpl;
   DCHECK(instance);
   return instance;
 }
 
 // static
 void WindowManager::Shutdown() {
   DCHECK(instance);
   delete instance;
   DCHECK(!instance);
 }
 
 // static
 WindowManager* WindowManager::GetInstance() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena