Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1812)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm_shell.cc

Issue 2734653002: chromeos: Move files in //ash/common to //ash (Closed)
Patch Set: fix a11y tests, fix docs Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm_shell.h ('k') | ash/wm_transient_window_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/wm_shell.cc
similarity index 86%
rename from ash/common/wm_shell.cc
rename to ash/wm_shell.cc
index fcd7804aad242e9f61489c6f20e761ce8871bae5..a2bea2c121757fdb7c24d7b3613066d0f5cd21cb 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/wm_shell.cc
@@ -2,55 +2,55 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/common/wm_shell.h"
+#include "ash/wm_shell.h"
#include <utility>
-#include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/common/accelerators/ash_focus_manager_factory.h"
-#include "ash/common/accessibility_delegate.h"
-#include "ash/common/cast_config_controller.h"
-#include "ash/common/devtools/ash_devtools_css_agent.h"
-#include "ash/common/devtools/ash_devtools_dom_agent.h"
-#include "ash/common/focus_cycler.h"
-#include "ash/common/keyboard/keyboard_ui.h"
-#include "ash/common/media_controller.h"
-#include "ash/common/new_window_controller.h"
-#include "ash/common/palette_delegate.h"
-#include "ash/common/session/session_controller.h"
-#include "ash/common/session/session_state_delegate.h"
-#include "ash/common/shelf/app_list_shelf_item_delegate.h"
-#include "ash/common/shelf/shelf_controller.h"
-#include "ash/common/shelf/shelf_delegate.h"
-#include "ash/common/shelf/shelf_model.h"
-#include "ash/common/shelf/shelf_window_watcher.h"
-#include "ash/common/shell_delegate.h"
-#include "ash/common/shutdown_controller.h"
-#include "ash/common/system/brightness_control_delegate.h"
-#include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h"
-#include "ash/common/system/chromeos/keyboard_brightness_controller.h"
-#include "ash/common/system/chromeos/network/vpn_list.h"
-#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
-#include "ash/common/system/keyboard_brightness_control_delegate.h"
-#include "ash/common/system/locale/locale_notification_controller.h"
-#include "ash/common/system/toast/toast_manager.h"
-#include "ash/common/system/tray/system_tray_controller.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/system_tray_notifier.h"
-#include "ash/common/wallpaper/wallpaper_controller.h"
-#include "ash/common/wallpaper/wallpaper_delegate.h"
-#include "ash/common/wm/immersive_context_ash.h"
-#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/common/wm/mru_window_tracker.h"
-#include "ash/common/wm/overview/window_selector_controller.h"
-#include "ash/common/wm/root_window_finder.h"
-#include "ash/common/wm/system_modal_container_layout_manager.h"
-#include "ash/common/wm/window_cycle_controller.h"
-#include "ash/common/wm_activation_observer.h"
-#include "ash/common/wm_window.h"
+#include "ash/accelerators/accelerator_controller.h"
+#include "ash/accelerators/ash_focus_manager_factory.h"
+#include "ash/accessibility_delegate.h"
+#include "ash/cast_config_controller.h"
+#include "ash/devtools/ash_devtools_css_agent.h"
+#include "ash/devtools/ash_devtools_dom_agent.h"
+#include "ash/focus_cycler.h"
+#include "ash/keyboard/keyboard_ui.h"
+#include "ash/media_controller.h"
+#include "ash/new_window_controller.h"
+#include "ash/palette_delegate.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
+#include "ash/session/session_controller.h"
+#include "ash/session/session_state_delegate.h"
+#include "ash/shelf/app_list_shelf_item_delegate.h"
+#include "ash/shelf/shelf_controller.h"
+#include "ash/shelf/shelf_delegate.h"
+#include "ash/shelf/shelf_model.h"
+#include "ash/shelf/shelf_window_watcher.h"
#include "ash/shell.h"
+#include "ash/shell_delegate.h"
+#include "ash/shutdown_controller.h"
+#include "ash/system/brightness/brightness_controller_chromeos.h"
+#include "ash/system/brightness_control_delegate.h"
+#include "ash/system/keyboard_brightness_control_delegate.h"
+#include "ash/system/keyboard_brightness_controller.h"
+#include "ash/system/locale/locale_notification_controller.h"
+#include "ash/system/network/vpn_list.h"
+#include "ash/system/session/logout_confirmation_controller.h"
+#include "ash/system/toast/toast_manager.h"
+#include "ash/system/tray/system_tray_controller.h"
+#include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_notifier.h"
+#include "ash/wallpaper/wallpaper_controller.h"
+#include "ash/wallpaper/wallpaper_delegate.h"
+#include "ash/wm/immersive_context_ash.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/wm/mru_window_tracker.h"
+#include "ash/wm/overview/window_selector_controller.h"
+#include "ash/wm/root_window_finder.h"
+#include "ash/wm/system_modal_container_layout_manager.h"
+#include "ash/wm/window_cycle_controller.h"
+#include "ash/wm_activation_observer.h"
+#include "ash/wm_window.h"
#include "base/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
« no previous file with comments | « ash/wm_shell.h ('k') | ash/wm_transient_window_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698