[Sharesheet] Migrate sharesheet to ui/ash folder.

Bug: 1157713
Change-Id: I9f521bdb9f7cd31881b2359245700b03ff8af4b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2584629Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837412}

chrome/browser/DEPS

@@ -436,7 +436,6 @@ include_rules = [
   "+chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h",
   "+chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h",
   "+chrome/browser/ui/views/extensions/request_file_system_dialog_view.h",
-  "+chrome/browser/ui/views/sharesheet/sharesheet_bubble_view.h",
   "+chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.h",
 
   # Ensure that only the public interface of performance_manager gets used.

chrome/browser/sharesheet/sharesheet_service_delegate.cc

@@ -10,7 +10,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sharesheet/sharesheet_service.h"
 #include "chrome/browser/sharesheet/sharesheet_service_factory.h"
-#include "chrome/browser/ui/views/sharesheet/sharesheet_bubble_view.h"
+#include "chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.h"
 #include "ui/views/view.h"
 
 namespace sharesheet {

chrome/browser/ui/BUILD.gn

@@ -2044,6 +2044,12 @@ static_library("ui") {
       "ash/session_controller_client_impl.h",
       "ash/session_util.cc",
       "ash/session_util.h",
+      "ash/sharesheet/sharesheet_bubble_view.cc",
+      "ash/sharesheet/sharesheet_bubble_view.h",
+      "ash/sharesheet/sharesheet_expand_button.cc",
+      "ash/sharesheet/sharesheet_expand_button.h",
+      "ash/sharesheet/sharesheet_target_button.cc",
+      "ash/sharesheet/sharesheet_target_button.h",
       "ash/system_tray_client.cc",
       "ash/system_tray_client.h",
       "ash/tab_scrubber.cc",
@@ -2122,12 +2128,6 @@ static_library("ui") {
       "views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.h",
       "views/relaunch_notification/relaunch_notification_metrics.cc",
       "views/relaunch_notification/relaunch_notification_metrics.h",
-      "views/sharesheet/sharesheet_bubble_view.cc",
-      "views/sharesheet/sharesheet_bubble_view.h",
-      "views/sharesheet/sharesheet_expand_button.cc",
-      "views/sharesheet/sharesheet_expand_button.h",
-      "views/sharesheet/sharesheet_target_button.cc",
-      "views/sharesheet/sharesheet_target_button.h",
 
       # On chromeos, file manager extension handles the file open/save dialog.
       "views/select_file_dialog_extension.cc",

chrome/browser/ui/views/sharesheet/sharesheet_bubble_view.cc → chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.cc

@@ -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/views/sharesheet/sharesheet_bubble_view.h"
+#include "chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.h"
 
 #include <memory>
 #include <utility>
@@ -15,8 +15,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sharesheet/sharesheet_metrics.h"
 #include "chrome/browser/sharesheet/sharesheet_service_delegate.h"
-#include "chrome/browser/ui/views/sharesheet/sharesheet_expand_button.h"
-#include "chrome/browser/ui/views/sharesheet/sharesheet_target_button.h"
+#include "chrome/browser/ui/ash/sharesheet/sharesheet_expand_button.h"
+#include "chrome/browser/ui/ash/sharesheet/sharesheet_target_button.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "extensions/browser/app_window/app_window.h"

chrome/browser/ui/views/sharesheet/sharesheet_bubble_view.h → chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.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_VIEWS_SHARESHEET_SHARESHEET_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_SHARESHEET_SHARESHEET_BUBBLE_VIEW_H_
+#ifndef CHROME_BROWSER_UI_ASH_SHARESHEET_SHARESHEET_BUBBLE_VIEW_H_
+#define CHROME_BROWSER_UI_ASH_SHARESHEET_SHARESHEET_BUBBLE_VIEW_H_
 
 #include <vector>
 
@@ -15,7 +15,7 @@
 namespace views {
 class GridLayout;
 class Separator;
-}
+}  // namespace views
 
 namespace sharesheet {
 class SharesheetServiceDelegate;
@@ -98,4 +98,4 @@ class SharesheetBubbleView : public views::BubbleDialogDelegateView {
   SharesheetExpandButton* expand_button_ = nullptr;
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_SHARESHEET_SHARESHEET_BUBBLE_VIEW_H_
+#endif  // CHROME_BROWSER_UI_ASH_SHARESHEET_SHARESHEET_BUBBLE_VIEW_H_

chrome/browser/ui/views/sharesheet/sharesheet_bubble_view_browsertest.cc → chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc

@@ -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/views/sharesheet/sharesheet_bubble_view.h"
+#include "chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.h"
 
 #include <algorithm>
 

chrome/browser/ui/views/sharesheet/sharesheet_expand_button.cc → chrome/browser/ui/ash/sharesheet/sharesheet_expand_button.cc

@@ -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/views/sharesheet/sharesheet_expand_button.h"
+#include "chrome/browser/ui/ash/sharesheet/sharesheet_expand_button.h"
 
 #include "ash/public/cpp/ash_typography.h"
 #include "chrome/app/vector_icons/vector_icons.h"

chrome/browser/ui/views/sharesheet/sharesheet_expand_button.h → chrome/browser/ui/ash/sharesheet/sharesheet_expand_button.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_VIEWS_SHARESHEET_SHARESHEET_EXPAND_BUTTON_H_
-#define CHROME_BROWSER_UI_VIEWS_SHARESHEET_SHARESHEET_EXPAND_BUTTON_H_
+#ifndef CHROME_BROWSER_UI_ASH_SHARESHEET_SHARESHEET_EXPAND_BUTTON_H_
+#define CHROME_BROWSER_UI_ASH_SHARESHEET_SHARESHEET_EXPAND_BUTTON_H_
 
 #include "chrome/browser/sharesheet/sharesheet_types.h"
 #include "ui/views/controls/button/button.h"
@@ -27,4 +27,4 @@ class SharesheetExpandButton : public views::Button {
   views::Label* label_ = nullptr;
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_SHARESHEET_SHARESHEET_EXPAND_BUTTON_H_
+#endif  // CHROME_BROWSER_UI_ASH_SHARESHEET_SHARESHEET_EXPAND_BUTTON_H_

chrome/browser/ui/views/sharesheet/sharesheet_target_button.cc → chrome/browser/ui/ash/sharesheet/sharesheet_target_button.cc

@@ -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/views/sharesheet/sharesheet_target_button.h"
+#include "chrome/browser/ui/ash/sharesheet/sharesheet_target_button.h"
 
 #include <memory>
 

chrome/browser/ui/views/sharesheet/sharesheet_target_button.h → chrome/browser/ui/ash/sharesheet/sharesheet_target_button.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_VIEWS_SHARESHEET_SHARESHEET_TARGET_BUTTON_H_
-#define CHROME_BROWSER_UI_VIEWS_SHARESHEET_SHARESHEET_TARGET_BUTTON_H_
+#ifndef CHROME_BROWSER_UI_ASH_SHARESHEET_SHARESHEET_TARGET_BUTTON_H_
+#define CHROME_BROWSER_UI_ASH_SHARESHEET_SHARESHEET_TARGET_BUTTON_H_
 
 #include "base/optional.h"
 #include "chrome/browser/sharesheet/sharesheet_types.h"
@@ -34,4 +34,4 @@ class SharesheetTargetButton : public views::Button {
   gfx::Size CalculatePreferredSize() const override;
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_SHARESHEET_SHARESHEET_TARGET_BUTTON_H_
+#endif  // CHROME_BROWSER_UI_ASH_SHARESHEET_SHARESHEET_TARGET_BUTTON_H_

chrome/test/BUILD.gn

@@ -2795,6 +2795,7 @@ if (!is_android) {
         "../browser/ui/ash/multi_user/test_multi_user_window_manager.h",
         "../browser/ui/ash/recording_service_browsertest.cc",
         "../browser/ui/ash/screen_orientation_delegate_chromeos_browsertest.cc",
+        "../browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc",
         "../browser/ui/ash/shelf_browsertest.cc",
         "../browser/ui/ash/system_tray_client_browsertest.cc",
         "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc",
@@ -2824,7 +2825,6 @@ if (!is_android) {
         "../browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc",
         "../browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc",
         "../browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc",
-        "../browser/ui/views/sharesheet/sharesheet_bubble_view_browsertest.cc",
         "../browser/ui/views/supervised_user/extension_install_blocked_by_parent_dialog_view_browsertest.cc",
         "../browser/ui/views/supervised_user/parent_permission_dialog_view_browsertest.cc",
         "../browser/ui/views/web_apps/web_app_ash_interactive_ui_test.cc",