Commit 78124b49 authored by nancy's avatar nancy Committed by Commit Bot

Move AppService app window related code to app_service directory.

TBR=joelhockey@chromium.org

BUG=1011235

Change-Id: Ia48be8b3e6b5d03bcb1c505ab405c536786cae7a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1975381Reviewed-by: default avatarNancy Wang <nancylingwang@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726501}
parent 58711b65
......@@ -30,8 +30,8 @@
#include "chrome/browser/chromeos/virtual_machines/virtual_machines_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/crostini/crostini_app_icon.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_crostini_tracker.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_crostini_tracker.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/crostini_app_window_shelf_controller.h"
#include "chrome/browser/ui/ash/launcher/shelf_spinner_controller.h"
......
......@@ -3764,16 +3764,18 @@ jumbo_static_library("ui") {
"ash/assistant/proactive_suggestions_client_impl.h",
"ash/assistant/proactive_suggestions_loader.cc",
"ash/assistant/proactive_suggestions_loader.h",
"ash/launcher/app_service_app_window_arc_tracker.cc",
"ash/launcher/app_service_app_window_arc_tracker.h",
"ash/launcher/app_service_app_window_crostini_tracker.cc",
"ash/launcher/app_service_app_window_crostini_tracker.h",
"ash/launcher/app_service_app_window_launcher_controller.cc",
"ash/launcher/app_service_app_window_launcher_controller.h",
"ash/launcher/app_service_app_window_launcher_item_controller.cc",
"ash/launcher/app_service_app_window_launcher_item_controller.h",
"ash/launcher/app_service_instance_registry_helper.cc",
"ash/launcher/app_service_instance_registry_helper.h",
"ash/launcher/app_service/app_service_app_window_arc_tracker.cc",
"ash/launcher/app_service/app_service_app_window_arc_tracker.h",
"ash/launcher/app_service/app_service_app_window_crostini_tracker.cc",
"ash/launcher/app_service/app_service_app_window_crostini_tracker.h",
"ash/launcher/app_service/app_service_app_window_launcher_controller.cc",
"ash/launcher/app_service/app_service_app_window_launcher_controller.h",
"ash/launcher/app_service/app_service_app_window_launcher_item_controller.cc",
"ash/launcher/app_service/app_service_app_window_launcher_item_controller.h",
"ash/launcher/app_service/app_service_instance_registry_helper.cc",
"ash/launcher/app_service/app_service_instance_registry_helper.h",
"ash/launcher/app_service/launcher_app_service_app_updater.cc",
"ash/launcher/app_service/launcher_app_service_app_updater.h",
"ash/launcher/app_window_base.cc",
"ash/launcher/app_window_base.h",
"ash/launcher/arc_app_shelf_id.cc",
......@@ -3799,8 +3801,6 @@ jumbo_static_library("ui") {
"ash/launcher/internal_app_shelf_context_menu.h",
"ash/launcher/internal_app_window_shelf_controller.cc",
"ash/launcher/internal_app_window_shelf_controller.h",
"ash/launcher/launcher_app_service_app_updater.cc",
"ash/launcher/launcher_app_service_app_updater.h",
"ash/launcher/launcher_arc_app_updater.cc",
"ash/launcher/launcher_arc_app_updater.h",
"ash/launcher/launcher_crostini_app_updater.cc",
......
nancylingwang@chromium.org
dominickn@chromium.org
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/ash/launcher/app_service_app_window_arc_tracker.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_arc_tracker.h"
#include "ash/public/cpp/app_types.h"
#include "ash/public/cpp/multi_user_window_manager.h"
......@@ -16,8 +16,8 @@
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/app_window_base.h"
#include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/arc_app_window.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_ARC_TRACKER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_ARC_TRACKER_H_
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_ARC_TRACKER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_ARC_TRACKER_H_
#include <map>
#include <memory>
......@@ -131,4 +131,4 @@ class AppServiceAppWindowArcTracker : public ArcAppListPrefs::Observer,
base::Time opt_in_management_check_start_time_;
};
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_ARC_TRACKER_H_
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_ARC_TRACKER_H_
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/ash/launcher/app_service_app_window_crostini_tracker.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_crostini_tracker.h"
#include "ash/public/cpp/multi_user_window_manager.h"
#include "ash/public/cpp/shelf_model.h"
......@@ -15,8 +15,8 @@
#include "chrome/browser/chromeos/plugin_vm/plugin_vm_util.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/shelf_spinner_controller.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_helper.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_CROSTINI_TRACKER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_CROSTINI_TRACKER_H_
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_CROSTINI_TRACKER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_CROSTINI_TRACKER_H_
#include "ash/public/cpp/shelf_types.h"
#include "base/containers/flat_map.h"
......@@ -65,4 +65,4 @@ class AppServiceAppWindowCrostiniTracker {
int64_t display_id_to_restart_in_ = 0;
};
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_CROSTINI_TRACKER_H_
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_CROSTINI_TRACKER_H_
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_controller.h"
#include <memory>
......@@ -17,9 +17,9 @@
#include "chrome/browser/chromeos/plugin_vm/plugin_vm_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_arc_tracker.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_crostini_tracker.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_arc_tracker.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_crostini_tracker.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/app_window_base.h"
#include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/arc_app_window.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_LAUNCHER_CONTROLLER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_LAUNCHER_CONTROLLER_H_
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_LAUNCHER_CONTROLLER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_LAUNCHER_CONTROLLER_H_
#include <map>
#include <memory>
......@@ -13,7 +13,7 @@
#include "base/macros.h"
#include "base/scoped_observer.h"
#include "chrome/browser/apps/app_service/app_service_proxy.h"
#include "chrome/browser/ui/ash/launcher/app_service_instance_registry_helper.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_instance_registry_helper.h"
#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/arc_app_window_delegate.h"
#include "chrome/services/app_service/public/cpp/instance_registry.h"
......@@ -144,4 +144,4 @@ class AppServiceAppWindowLauncherController
DISALLOW_COPY_AND_ASSIGN(AppServiceAppWindowLauncherController);
};
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_LAUNCHER_CONTROLLER_H_
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_LAUNCHER_CONTROLLER_H_
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_item_controller.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/public/cpp/window_state_type.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
#include <set>
......@@ -43,4 +43,4 @@ class AppServiceAppWindowLauncherItemController
std::set<int> task_ids_;
};
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/ash/launcher/app_service_instance_registry_helper.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_instance_registry_helper.h"
#include <set>
#include <string>
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_INSTANCE_REGISTRY_HELPER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_INSTANCE_REGISTRY_HELPER_H_
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_INSTANCE_REGISTRY_HELPER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_INSTANCE_REGISTRY_HELPER_H_
#include <memory>
......@@ -111,4 +111,4 @@ class AppServiceInstanceRegistryHelper {
DISALLOW_COPY_AND_ASSIGN(AppServiceInstanceRegistryHelper);
};
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_INSTANCE_REGISTRY_HELPER_H_
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_APP_SERVICE_INSTANCE_REGISTRY_HELPER_H_
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/ash/launcher/launcher_app_service_app_updater.h"
#include "chrome/browser/ui/ash/launcher/app_service/launcher_app_service_app_updater.h"
#include "chrome/browser/apps/app_service/app_service_proxy.h"
#include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_APP_SERVICE_APP_UPDATER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_APP_SERVICE_APP_UPDATER_H_
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_LAUNCHER_APP_SERVICE_APP_UPDATER_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_LAUNCHER_APP_SERVICE_APP_UPDATER_H_
#include <set>
#include <string>
......@@ -35,4 +35,4 @@ class LauncherAppServiceAppUpdater : public LauncherAppUpdater,
DISALLOW_COPY_AND_ASSIGN(LauncherAppServiceAppUpdater);
};
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_APP_SERVICE_APP_UPDATER_H_
#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SERVICE_LAUNCHER_APP_SERVICE_APP_UPDATER_H_
......@@ -8,7 +8,7 @@
#include "ash/public/cpp/shelf_types.h"
#include "base/macros.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
......
......@@ -12,7 +12,7 @@
#include <string>
#include "base/macros.h"
#include "chrome/browser/ui/ash/launcher/app_service_instance_registry_helper.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_instance_registry_helper.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
#include "chrome/browser/ui/browser_list_observer.h"
#include "chrome/browser/ui/browser_tab_strip_tracker.h"
......
......@@ -43,7 +43,8 @@
#include "chrome/browser/ui/apps/app_info_dialog.h"
#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
#include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/launcher_app_service_app_updater.h"
#include "chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h"
#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
......@@ -53,7 +54,6 @@
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
#include "chrome/browser/ui/ash/launcher/crostini_app_window_shelf_controller.h"
#include "chrome/browser/ui/ash/launcher/internal_app_window_shelf_controller.h"
#include "chrome/browser/ui/ash/launcher/launcher_app_service_app_updater.h"
#include "chrome/browser/ui/ash/launcher/launcher_arc_app_updater.h"
#include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
#include "chrome/browser/ui/ash/launcher/launcher_crostini_app_updater.h"
......
......@@ -4,8 +4,8 @@
#include "chrome/browser/ui/views/crostini/crostini_app_restart_view.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_crostini_tracker.h"
#include "chrome/browser/ui/ash/launcher/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_crostini_tracker.h"
#include "chrome/browser/ui/ash/launcher/app_service/app_service_app_window_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/crostini_app_window_shelf_controller.h"
#include "chrome/browser/ui/browser_dialogs.h"
......
......@@ -2385,7 +2385,7 @@ if (!is_android) {
"../browser/ui/ash/chrome_screenshot_grabber_browsertest.cc",
"../browser/ui/ash/keyboard/keyboard_controller_browsertest.cc",
"../browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc",
"../browser/ui/ash/launcher/app_service_app_window_browsertest.cc",
"../browser/ui/ash/launcher/app_service/app_service_app_window_browsertest.cc",
"../browser/ui/ash/launcher/arc_app_launcher_browsertest.cc",
"../browser/ui/ash/launcher/browser_shortcut_launcher_item_controller_browsertest.cc",
"../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment