Creating default implementation for aura::client::ScreenPositionClient

athena/screen/screen_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/screen/screen_manager_impl.h"
 
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/screen/modal_window_controller.h"
 #include "athena/screen/screen_accelerator_handler.h"
 #include "athena/util/container_priorities.h"
 #include "athena/util/fill_layout_manager.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_targeter.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/capture_controller.h"
+#include "ui/wm/core/default_screen_position_client.h"
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/window_util.h"
 
 // This is to avoid creating type definitoin for kAlwaysOnTopKey.
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ATHENA_EXPORT, bool);
 
 namespace athena {
 namespace {
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ScreenManager::ContainerParams,
@@ skipping 78 matching lines @@
     aura::Window* next = wm::BaseFocusRules::GetNextActivatableWindow(ignore);
     // TODO(oshima): Search from activatable containers if |next| is nullptr.
     // crbug.com/424750.
     return next;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AthenaFocusRules);
 };
 
-class AthenaScreenPositionClient : public aura::client::ScreenPositionClient {
+class AthenaScreenPositionClient : public wm::DefaultScreenPositionClient {
  public:
   AthenaScreenPositionClient() {
   }
   ~AthenaScreenPositionClient() override {}
 
  private:
   // aura::client::ScreenPositionClient:
-  virtual void ConvertPointToScreen(const aura::Window* window,
-                                    gfx::Point* point) override {
-    const aura::Window* root = window->GetRootWindow();
-    aura::Window::ConvertPointToTarget(window, root, point);
-  }
-
-  virtual void ConvertPointFromScreen(const aura::Window* window,
-                                      gfx::Point* point) override {
-    const aura::Window* root = window->GetRootWindow();
-    aura::Window::ConvertPointToTarget(root, window, point);
-  }
-
-  virtual void ConvertHostPointToScreen(aura::Window* window,
-                                        gfx::Point* point) override {
+  void ConvertHostPointToScreen(aura::Window* window,
+                                gfx::Point* point) override {
     // TODO(oshima): Implement this when adding multiple display support.
     NOTREACHED();
   }
 
-  virtual void SetBounds(aura::Window* window,
-                         const gfx::Rect& bounds,
-                         const gfx::Display& display) override {
-    window->SetBounds(bounds);
-  }
-
   DISALLOW_COPY_AND_ASSIGN(AthenaScreenPositionClient);
 };
 
 class AthenaWindowTargeter : public aura::WindowTargeter {
  public:
   explicit AthenaWindowTargeter(aura::Window* root_window)
       : root_window_(root_window) {}
 
   ~AthenaWindowTargeter() override {}
 
@@ skipping 230 matching lines @@
 }
 
 // static
 void ScreenManager::Shutdown() {
   DCHECK(instance);
   delete instance;
   DCHECK(!instance);
 }
 
 }  // namespace athena