Rename SelectFileLacros to SelectFileAsh

Also move it and AshChromeServiceImpl into namespace crosapi.

This is consistent with our plan for interface names from
go/lacros-main-dd.

Bug: none
Change-Id: Ice369bd8da4ebdc9de4de2a69ce7a457ed13968a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2349888
Commit-Queue: James Cook <jamescook@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Auto-Submit: James Cook <jamescook@chromium.org>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796960}

chrome/browser/chromeos/BUILD.gn

@@ -927,8 +927,8 @@ source_set("chromeos") {
     "crosapi/browser_util.h",
     "crosapi/screen_manager_crosapi.cc",
     "crosapi/screen_manager_crosapi.h",
-    "crosapi/select_file_crosapi.cc",
-    "crosapi/select_file_crosapi.h",
+    "crosapi/select_file_ash.cc",
+    "crosapi/select_file_ash.h",
     "crostini/ansible/ansible_management_service.cc",
     "crostini/ansible/ansible_management_service.h",
     "crostini/ansible/ansible_management_service_factory.cc",

chrome/browser/chromeos/crosapi/DEPS

@@ -3,7 +3,7 @@ specific_include_rules = {
     # For window parenting.
     "+ash/shell.h",
   ],
-  "select_file_crosapi\.cc": [
+  "select_file_ash\.cc": [
     # For window parenting.
     "+ash/shell.h",
     "+ash/wm/desks/desks_util.h",

chrome/browser/chromeos/crosapi/ash_chrome_service_impl.cc

@@ -8,12 +8,14 @@
 
 #include "base/logging.h"
 #include "chrome/browser/chromeos/crosapi/screen_manager_crosapi.h"
-#include "chrome/browser/chromeos/crosapi/select_file_crosapi.h"
+#include "chrome/browser/chromeos/crosapi/select_file_ash.h"
 #include "chromeos/crosapi/mojom/screen_manager.mojom.h"
 #include "chromeos/crosapi/mojom/select_file.mojom.h"
 
+namespace crosapi {
+
 AshChromeServiceImpl::AshChromeServiceImpl(
-    mojo::PendingReceiver<crosapi::mojom::AshChromeService> pending_receiver)
+    mojo::PendingReceiver<mojom::AshChromeService> pending_receiver)
     : receiver_(this, std::move(pending_receiver)),
       screen_manager_crosapi_(std::make_unique<ScreenManagerCrosapi>()) {
   // TODO(hidehiko): Remove non-critical log from here.
@@ -24,12 +26,13 @@ AshChromeServiceImpl::AshChromeServiceImpl(
 AshChromeServiceImpl::~AshChromeServiceImpl() = default;
 
 void AshChromeServiceImpl::BindSelectFile(
-    mojo::PendingReceiver<crosapi::mojom::SelectFile> receiver) {
-  select_file_crosapi_ =
-      std::make_unique<SelectFileCrosapi>(std::move(receiver));
+    mojo::PendingReceiver<mojom::SelectFile> receiver) {
+  select_file_crosapi_ = std::make_unique<SelectFileAsh>(std::move(receiver));
 }
 
 void AshChromeServiceImpl::BindScreenManager(
-    mojo::PendingReceiver<crosapi::mojom::ScreenManager> receiver) {
+    mojo::PendingReceiver<mojom::ScreenManager> receiver) {
   screen_manager_crosapi_->BindReceiver(std::move(receiver));
 }
+
+}  // namespace crosapi

chrome/browser/chromeos/crosapi/ash_chrome_service_impl.h

@@ -12,27 +12,32 @@
 #include "mojo/public/cpp/bindings/receiver.h"
 
 class ScreenManagerCrosapi;
-class SelectFileCrosapi;
+
+namespace crosapi {
+
+class SelectFileAsh;
 
 // Implementation of AshChromeService. It provides a set of APIs that
 // lacros-chrome can call into.
-class AshChromeServiceImpl : public crosapi::mojom::AshChromeService {
+class AshChromeServiceImpl : public mojom::AshChromeService {
  public:
   explicit AshChromeServiceImpl(
-      mojo::PendingReceiver<crosapi::mojom::AshChromeService> pending_receiver);
+      mojo::PendingReceiver<mojom::AshChromeService> pending_receiver);
   ~AshChromeServiceImpl() override;
 
   // crosapi::mojom::AshChromeService:
   void BindScreenManager(
-      mojo::PendingReceiver<crosapi::mojom::ScreenManager> receiver) override;
+      mojo::PendingReceiver<mojom::ScreenManager> receiver) override;
   void BindSelectFile(
-      mojo::PendingReceiver<crosapi::mojom::SelectFile> receiver) override;
+      mojo::PendingReceiver<mojom::SelectFile> receiver) override;
 
  private:
-  mojo::Receiver<crosapi::mojom::AshChromeService> receiver_;
+  mojo::Receiver<mojom::AshChromeService> receiver_;
 
   std::unique_ptr<ScreenManagerCrosapi> screen_manager_crosapi_;
-  std::unique_ptr<SelectFileCrosapi> select_file_crosapi_;
+  std::unique_ptr<SelectFileAsh> select_file_crosapi_;
 };
 
+}  // namespace crosapi
+
 #endif  // CHROME_BROWSER_CHROMEOS_CROSAPI_ASH_CHROME_SERVICE_IMPL_H_

chrome/browser/chromeos/crosapi/browser_manager.h

@@ -20,10 +20,9 @@ namespace component_updater {
 class CrOSComponentManager;
 }  // namespace component_updater
 
-class AshChromeServiceImpl;
-
 namespace crosapi {
 
+class AshChromeServiceImpl;
 class BrowserLoader;
 
 // Manages the lifetime of lacros-chrome, and its loading status. This class is

chrome/browser/chromeos/crosapi/select_file_crosapi.cc → chrome/browser/chromeos/crosapi/select_file_ash.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/chromeos/crosapi/select_file_crosapi.h"
+#include "chrome/browser/chromeos/crosapi/select_file_ash.h"
 
 #include <utility>
 #include <vector>
@@ -20,34 +20,34 @@
 #include "ui/shell_dialogs/selected_file_info.h"
 #include "url/gurl.h"
 
+namespace crosapi {
 namespace {
 
-ui::SelectFileDialog::Type GetUiType(
-    crosapi::mojom::SelectFileDialogType type) {
+ui::SelectFileDialog::Type GetUiType(mojom::SelectFileDialogType type) {
   switch (type) {
-    case crosapi::mojom::SelectFileDialogType::kFolder:
+    case mojom::SelectFileDialogType::kFolder:
       return ui::SelectFileDialog::Type::SELECT_FOLDER;
-    case crosapi::mojom::SelectFileDialogType::kUploadFolder:
+    case mojom::SelectFileDialogType::kUploadFolder:
       return ui::SelectFileDialog::Type::SELECT_UPLOAD_FOLDER;
-    case crosapi::mojom::SelectFileDialogType::kExistingFolder:
+    case mojom::SelectFileDialogType::kExistingFolder:
       return ui::SelectFileDialog::Type::SELECT_EXISTING_FOLDER;
-    case crosapi::mojom::SelectFileDialogType::kOpenFile:
+    case mojom::SelectFileDialogType::kOpenFile:
       return ui::SelectFileDialog::Type::SELECT_OPEN_FILE;
-    case crosapi::mojom::SelectFileDialogType::kOpenMultiFile:
+    case mojom::SelectFileDialogType::kOpenMultiFile:
       return ui::SelectFileDialog::Type::SELECT_OPEN_MULTI_FILE;
-    case crosapi::mojom::SelectFileDialogType::kSaveAsFile:
+    case mojom::SelectFileDialogType::kSaveAsFile:
       return ui::SelectFileDialog::Type::SELECT_SAVEAS_FILE;
   }
 }
 
 ui::SelectFileDialog::FileTypeInfo::AllowedPaths GetUiAllowedPaths(
-    crosapi::mojom::AllowedPaths allowed_paths) {
+    mojom::AllowedPaths allowed_paths) {
   switch (allowed_paths) {
-    case crosapi::mojom::AllowedPaths::kAnyPath:
+    case mojom::AllowedPaths::kAnyPath:
       return ui::SelectFileDialog::FileTypeInfo::ANY_PATH;
-    case crosapi::mojom::AllowedPaths::kNativePath:
+    case mojom::AllowedPaths::kNativePath:
       return ui::SelectFileDialog::FileTypeInfo::NATIVE_PATH;
-    case crosapi::mojom::AllowedPaths::kAnyPathOrUrl:
+    case mojom::AllowedPaths::kAnyPathOrUrl:
       return ui::SelectFileDialog::FileTypeInfo::ANY_PATH_OR_URL;
   }
 }
@@ -83,8 +83,8 @@ aura::Window* GetShellSurfaceWindow(const std::string& app_id) {
 class SelectFileDialogHolder : public ui::SelectFileDialog::Listener {
  public:
   SelectFileDialogHolder(aura::Window* shell_surface_window,
-                         crosapi::mojom::SelectFileOptionsPtr options,
-                         crosapi::mojom::SelectFile::SelectCallback callback)
+                         mojom::SelectFileOptionsPtr options,
+                         mojom::SelectFile::SelectCallback callback)
       : select_callback_(std::move(callback)) {
     DCHECK(shell_surface_window);
     // Policy is null because showing the file-dialog-blocked infobar is handled
@@ -163,10 +163,9 @@ class SelectFileDialogHolder : public ui::SelectFileDialog::Listener {
   // Invokes |select_callback_| with the list of files and deletes this object.
   void OnSelected(const std::vector<ui::SelectedFileInfo>& files,
                   int file_type_index) {
-    std::vector<crosapi::mojom::SelectedFileInfoPtr> mojo_files;
+    std::vector<mojom::SelectedFileInfoPtr> mojo_files;
     for (const ui::SelectedFileInfo& file : files) {
-      crosapi::mojom::SelectedFileInfoPtr mojo_file =
-          crosapi::mojom::SelectedFileInfo::New();
+      mojom::SelectedFileInfoPtr mojo_file = mojom::SelectedFileInfo::New();
       mojo_file->file_path = file.file_path;
       mojo_file->local_path = file.local_path;
       mojo_file->display_name = file.display_name;
@@ -174,13 +173,13 @@ class SelectFileDialogHolder : public ui::SelectFileDialog::Listener {
       mojo_files.push_back(std::move(mojo_file));
     }
     std::move(select_callback_)
-        .Run(crosapi::mojom::SelectFileResult::kSuccess, std::move(mojo_files),
+        .Run(mojom::SelectFileResult::kSuccess, std::move(mojo_files),
              file_type_index);
     delete this;
   }
 
   // Callback run after files are selected or the dialog is canceled.
-  crosapi::mojom::SelectFile::SelectCallback select_callback_;
+  mojom::SelectFile::SelectCallback select_callback_;
 
   // The file select dialog.
   scoped_refptr<SelectFileDialogExtension> select_file_dialog_;
@@ -192,23 +191,24 @@ class SelectFileDialogHolder : public ui::SelectFileDialog::Listener {
 }  // namespace
 
 // TODO(https://crbug.com/1090587): Connection error handling.
-SelectFileCrosapi::SelectFileCrosapi(
-    mojo::PendingReceiver<crosapi::mojom::SelectFile> receiver)
+SelectFileAsh::SelectFileAsh(mojo::PendingReceiver<mojom::SelectFile> receiver)
     : receiver_(this, std::move(receiver)) {}
 
-SelectFileCrosapi::~SelectFileCrosapi() = default;
+SelectFileAsh::~SelectFileAsh() = default;
 
-void SelectFileCrosapi::Select(crosapi::mojom::SelectFileOptionsPtr options,
-                               SelectCallback callback) {
+void SelectFileAsh::Select(mojom::SelectFileOptionsPtr options,
+                           SelectCallback callback) {
   aura::Window* shell_surface_window =
       GetShellSurfaceWindow(options->owning_shell_window_id);
   // Bail out if the shell surface doesn't exist any more.
   if (!shell_surface_window) {
-    std::move(callback).Run(
-        crosapi::mojom::SelectFileResult::kInvalidShellWindow, {}, 0);
+    std::move(callback).Run(mojom::SelectFileResult::kInvalidShellWindow, {},
+                            0);
     return;
   }
   // Deletes itself when the dialog closes.
   new SelectFileDialogHolder(shell_surface_window, std::move(options),
                              std::move(callback));
 }
+
+}  // namespace crosapi

chrome/browser/chromeos/crosapi/select_file_crosapi.h → chrome/browser/chromeos/crosapi/select_file_ash.h

@@ -2,30 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CROSAPI_SELECT_FILE_CROSAPI_H_
-#define CHROME_BROWSER_CHROMEOS_CROSAPI_SELECT_FILE_CROSAPI_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROSAPI_SELECT_FILE_ASH_H_
+#define CHROME_BROWSER_CHROMEOS_CROSAPI_SELECT_FILE_ASH_H_
 
 #include "chromeos/crosapi/mojom/select_file.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 
+namespace crosapi {
+
 // Implements the SelectFile mojo interface for open/save dialogs. Wraps the
 // underlying Chrome OS SelectFileExtension implementation, which uses the WebUI
 // file manager to provide the dialogs. Lives on the UI thread.
-class SelectFileCrosapi : public crosapi::mojom::SelectFile {
+class SelectFileAsh : public mojom::SelectFile {
  public:
-  explicit SelectFileCrosapi(
-      mojo::PendingReceiver<crosapi::mojom::SelectFile> receiver);
-  SelectFileCrosapi(const SelectFileCrosapi&) = delete;
-  SelectFileCrosapi& operator=(const SelectFileCrosapi&) = delete;
-  ~SelectFileCrosapi() override;
+  explicit SelectFileAsh(mojo::PendingReceiver<mojom::SelectFile> receiver);
+  SelectFileAsh(const SelectFileAsh&) = delete;
+  SelectFileAsh& operator=(const SelectFileAsh&) = delete;
+  ~SelectFileAsh() override;
 
   // crosapi::mojom::SelectFile:
-  void Select(crosapi::mojom::SelectFileOptionsPtr options,
+  void Select(mojom::SelectFileOptionsPtr options,
               SelectCallback callback) override;
 
  private:
-  mojo::Receiver<crosapi::mojom::SelectFile> receiver_;
+  mojo::Receiver<mojom::SelectFile> receiver_;
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_CROSAPI_SELECT_FILE_CROSAPI_H_
+}  // namespace crosapi
+
+#endif  // CHROME_BROWSER_CHROMEOS_CROSAPI_SELECT_FILE_ASH_H_