Refactor: remove SetDisplayWorkAreaInsets calls.

ash/aura/wm_root_window_controller_aura.cc

 // Copyright 2016 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 "ash/aura/wm_root_window_controller_aura.h"
 
 #include "ash/aura/wm_shelf_aura.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
 #include "ash/common/wm_root_window_controller_observer.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/wm/workspace_controller.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/display/screen.h"
 #include "ui/events/event_targeter.h"
 #include "ui/events/event_utils.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::WmRootWindowControllerAura*);
 
 namespace ash {
 
 // TODO(sky): it likely makes more sense to hang this off RootWindowSettings.
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::WmRootWindowControllerAura,
                                  kWmRootWindowControllerKey,
                                  nullptr);
 
 WmRootWindowControllerAura::WmRootWindowControllerAura(
     RootWindowController* root_window_controller)
     : root_window_controller_(root_window_controller) {
   root_window_controller_->GetRootWindow()->SetProperty(
       kWmRootWindowControllerKey, this);
   WmShell::Get()->AddShellObserver(this);
+  display::Screen::GetScreen()->AddObserver(this);
 }
 
 WmRootWindowControllerAura::~WmRootWindowControllerAura() {
   WmShell::Get()->RemoveShellObserver(this);
+  display::Screen::GetScreen()->RemoveObserver(this);
 }
 
 // static
 const WmRootWindowControllerAura* WmRootWindowControllerAura::Get(
     const aura::Window* window) {
   if (!window)
     return nullptr;
 
   RootWindowController* root_window_controller =
       GetRootWindowController(window);
@@ skipping 71 matching lines @@
 void WmRootWindowControllerAura::AddObserver(
     WmRootWindowControllerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WmRootWindowControllerAura::RemoveObserver(
     WmRootWindowControllerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void WmRootWindowControllerAura::OnDisplayWorkAreaInsetsChanged() {
-  FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
-                    OnWorkAreaChanged());
-}
-
 void WmRootWindowControllerAura::OnFullscreenStateChanged(
     bool is_fullscreen,
     WmWindow* root_window) {
   if (WmWindowAura::GetAuraWindow(root_window) !=
       root_window_controller_->GetRootWindow())
     return;
 
   FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
                     OnFullscreenStateChanged(is_fullscreen));
 }
 
 void WmRootWindowControllerAura::OnShelfAlignmentChanged(
     WmWindow* root_window) {
   if (WmWindowAura::GetAuraWindow(root_window) !=
       root_window_controller_->GetRootWindow())
     return;
 
   FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
                     OnShelfAlignmentChanged());
 }
 
+void WmRootWindowControllerAura::OnDisplayMetricsChanged(
+    const display::Display& display,
+    uint32_t metrics) {
+  FOR_EACH_OBSERVER(WmRootWindowControllerObserver, observers_,
+                    OnWorkAreaChanged());
+}
+
+void WmRootWindowControllerAura::OnDisplayAdded(
+    const display::Display& display) {}
+
+void WmRootWindowControllerAura::OnDisplayRemoved(
+    const display::Display& display) {}

[oshima, 2016/07/26 20:53:03]

nit: please keep the same order as in the header.

[hariank, 2016/07/26 22:05:16]

Done.

+
 }  // namespace ash