| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/launcher/launcher.h" | 5 #include "ash/launcher/launcher.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "ash/focus_cycler.h" | 10 #include "ash/focus_cycler.h" |
| 11 #include "ash/launcher/launcher_delegate.h" | 11 #include "ash/launcher/launcher_delegate.h" |
| 12 #include "ash/launcher/launcher_item_delegate.h" | 12 #include "ash/launcher/launcher_item_delegate.h" |
| 13 #include "ash/launcher/launcher_item_delegate_manager.h" | 13 #include "ash/launcher/launcher_item_delegate_manager.h" |
| 14 #include "ash/launcher/launcher_model.h" | 14 #include "ash/launcher/launcher_model.h" |
| 15 #include "ash/launcher/launcher_navigator.h" | 15 #include "ash/launcher/launcher_navigator.h" |
| 16 #include "ash/launcher/launcher_view.h" | 16 #include "ash/launcher/launcher_view.h" |
| 17 #include "ash/root_window_controller.h" | 17 #include "ash/root_window_controller.h" |
| 18 #include "ash/screen_ash.h" | 18 #include "ash/screen_ash.h" |
| 19 #include "ash/shelf/shelf_layout_manager.h" | 19 #include "ash/shelf/shelf_layout_manager.h" |
| 20 #include "ash/shelf/shelf_widget.h" | 20 #include "ash/shelf/shelf_widget.h" |
| 21 #include "ash/shell.h" | 21 #include "ash/shell.h" |
| 22 #include "ash/shell_delegate.h" | 22 #include "ash/shell_delegate.h" |
| 23 #include "ash/shell_window_ids.h" | 23 #include "ash/shell_window_ids.h" |
| 24 #include "ash/wm/property_util.h" | |
| 25 #include "ash/wm/window_properties.h" | 24 #include "ash/wm/window_properties.h" |
| 26 #include "grit/ash_resources.h" | 25 #include "grit/ash_resources.h" |
| 27 #include "ui/aura/client/activation_client.h" | 26 #include "ui/aura/client/activation_client.h" |
| 28 #include "ui/aura/root_window.h" | 27 #include "ui/aura/root_window.h" |
| 29 #include "ui/aura/window.h" | 28 #include "ui/aura/window.h" |
| 30 #include "ui/aura/window_observer.h" | 29 #include "ui/aura/window_observer.h" |
| 31 #include "ui/base/resource/resource_bundle.h" | 30 #include "ui/base/resource/resource_bundle.h" |
| 32 #include "ui/compositor/layer.h" | 31 #include "ui/compositor/layer.h" |
| 33 #include "ui/gfx/canvas.h" | 32 #include "ui/gfx/canvas.h" |
| 34 #include "ui/gfx/image/image.h" | 33 #include "ui/gfx/image/image.h" |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 182 |
| 184 gfx::Rect Launcher::GetLauncherViewBounds() const { | 183 gfx::Rect Launcher::GetLauncherViewBounds() const { |
| 185 return launcher_view_->bounds(); | 184 return launcher_view_->bounds(); |
| 186 } | 185 } |
| 187 | 186 |
| 188 app_list::ApplicationDragAndDropHost* Launcher::GetDragAndDropHostForAppList() { | 187 app_list::ApplicationDragAndDropHost* Launcher::GetDragAndDropHostForAppList() { |
| 189 return launcher_view_; | 188 return launcher_view_; |
| 190 } | 189 } |
| 191 | 190 |
| 192 } // namespace ash | 191 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 24108003:
[Cleanup] Rename WindowSettings to WindowState (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src