| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ash/shelf/shelf_window_watcher.h" | 5 #include "ash/shelf/shelf_window_watcher.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "ash/common/shell_window_ids.h" |
| 10 #include "ash/common/wm/window_state.h" | 11 #include "ash/common/wm/window_state.h" |
| 11 #include "ash/display/window_tree_host_manager.h" | 12 #include "ash/display/window_tree_host_manager.h" |
| 12 #include "ash/shelf/shelf_constants.h" | 13 #include "ash/shelf/shelf_constants.h" |
| 13 #include "ash/shelf/shelf_item_delegate_manager.h" | 14 #include "ash/shelf/shelf_item_delegate_manager.h" |
| 14 #include "ash/shelf/shelf_model.h" | 15 #include "ash/shelf/shelf_model.h" |
| 15 #include "ash/shelf/shelf_util.h" | 16 #include "ash/shelf/shelf_util.h" |
| 16 #include "ash/shelf/shelf_window_watcher_item_delegate.h" | 17 #include "ash/shelf/shelf_window_watcher_item_delegate.h" |
| 17 #include "ash/shell.h" | 18 #include "ash/shell.h" |
| 18 #include "ash/shell_window_ids.h" | |
| 19 #include "ash/wm/window_state_aura.h" | 19 #include "ash/wm/window_state_aura.h" |
| 20 #include "ash/wm/window_util.h" | 20 #include "ash/wm/window_util.h" |
| 21 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
| 22 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
| 23 #include "ui/display/screen.h" | 23 #include "ui/display/screen.h" |
| 24 #include "ui/gfx/image/image_skia.h" | 24 #include "ui/gfx/image/image_skia.h" |
| 25 #include "ui/wm/public/activation_client.h" | 25 #include "ui/wm/public/activation_client.h" |
| 26 | 26 |
| 27 namespace { | 27 namespace { |
| 28 | 28 |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 // When this is called, RootWindow of |old_display| is already removed. | 285 // When this is called, RootWindow of |old_display| is already removed. |
| 286 // Instead, we remove an observer from RootWindow and ActivationClient in the | 286 // Instead, we remove an observer from RootWindow and ActivationClient in the |
| 287 // OnRootWindowDestroyed(). | 287 // OnRootWindowDestroyed(). |
| 288 // Do nothing here. | 288 // Do nothing here. |
| 289 } | 289 } |
| 290 | 290 |
| 291 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&, | 291 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&, |
| 292 uint32_t) {} | 292 uint32_t) {} |
| 293 | 293 |
| 294 } // namespace ash | 294 } // namespace ash |
| OLD | NEW |