cros: Rename AssignToDesksMenu to MoveToDesksMenu.

This CL renames AssignToDesksMenu to MoveToDesksMenu. It also updates
comments related to this. Additionally, this CL also updates the command
ids and strings related to this menu.

Test: manual
Bug: 1166856
Change-Id: I24813b042e674031f3c09b74f4aaa5967df77aba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2630769Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Jeremy Chinsen <chinsenj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844306}

chrome/app/chrome_command_ids.h

@@ -91,16 +91,16 @@
 #define IDC_VISIT_DESKTOP_OF_LRU_USER_NEXT IDC_VISIT_DESKTOP_OF_LRU_USER_2
 #define IDC_VISIT_DESKTOP_OF_LRU_USER_LAST IDC_VISIT_DESKTOP_OF_LRU_USER_5
 
-// Assign to desk commands
-#define IDC_ASSIGN_TO_DESKS_MENU 34090
-#define IDC_SEND_TO_DESK_1 34091
-#define IDC_SEND_TO_DESK_2 34092
-#define IDC_SEND_TO_DESK_3 34093
-#define IDC_SEND_TO_DESK_4 34094
-#define IDC_SEND_TO_DESK_5 34095
-#define IDC_SEND_TO_DESK_6 34096
-#define IDC_SEND_TO_DESK_7 34097
-#define IDC_SEND_TO_DESK_8 34098
+// Move to desk commands
+#define IDC_MOVE_TO_DESKS_MENU 34090
+#define IDC_MOVE_TO_DESK_1 34091
+#define IDC_MOVE_TO_DESK_2 34092
+#define IDC_MOVE_TO_DESK_3 34093
+#define IDC_MOVE_TO_DESK_4 34094
+#define IDC_MOVE_TO_DESK_5 34095
+#define IDC_MOVE_TO_DESK_6 34096
+#define IDC_MOVE_TO_DESK_7 34097
+#define IDC_MOVE_TO_DESK_8 34098
 #define IDC_TOGGLE_ASSIGN_TO_ALL_DESKS 34099
 #endif
 

chrome/app/generated_resources.grd

@@ -1158,8 +1158,8 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_VISIT_DESKTOP_OF_LRU_USER" desc="The text label of the menu item which allows the user to move a window from one users desktop to another.">
           Move window to <ph name="USER_NAME">$1<ex>User name</ex></ph> (<ph name="USER_EMAIL">$2<ex>john@google.com</ex></ph>)
         </message>
-        <message name="IDS_ASSIGN_TO_DESKS_MENU" desc="The text label of the Assign to Desks submenu">
-          Assign to desk
+        <message name="IDS_MOVE_TO_DESKS_MENU" desc="The text label of the Move to Desks submenu">
+          Move window to desk
         </message>
         <message name="IDS_ASSIGN_TO_ALL_DESKS" desc="The text label of the Assign to All Desks menu item">
           All desks

chrome/app/generated_resources_grd/IDS_ASSIGN_TO_DESKS_MENU.png.sha1

-7c38bb4baa7fdc796988b34bae739b78000a9416
\ No newline at end of file

chrome/app/generated_resources_grd/IDS_MOVE_TO_DESKS_MENU.png.sha1

+1d09dd4bafe8dbe030fa6f7f7c1c23d69c3b4e1d
\ No newline at end of file

chrome/browser/ui/BUILD.gn

@@ -2076,8 +2076,8 @@ static_library("ui") {
       "settings_window_manager_chromeos.h",
       "settings_window_manager_observer_chromeos.h",
       "supervised_user/parent_permission_dialog.h",
-      "toolbar/assign_to_desks_menu_model.cc",
-      "toolbar/assign_to_desks_menu_model.h",
+      "toolbar/move_to_desks_menu_model.cc",
+      "toolbar/move_to_desks_menu_model.h",
       "views/apps/app_dialog/app_block_dialog_view.cc",
       "views/apps/app_dialog/app_block_dialog_view.h",
       "views/apps/app_dialog/app_pause_dialog_view.cc",

chrome/browser/ui/browser_command_controller.cc

@@ -674,15 +674,15 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
     case IDC_TAKE_SCREENSHOT:
       TakeScreenshot();
       break;
-    case IDC_SEND_TO_DESK_1:
-    case IDC_SEND_TO_DESK_2:
-    case IDC_SEND_TO_DESK_3:
-    case IDC_SEND_TO_DESK_4:
-    case IDC_SEND_TO_DESK_5:
-    case IDC_SEND_TO_DESK_6:
-    case IDC_SEND_TO_DESK_7:
-    case IDC_SEND_TO_DESK_8:
-      SendToDeskAtIndex(browser_, id - IDC_SEND_TO_DESK_1);
+    case IDC_MOVE_TO_DESK_1:
+    case IDC_MOVE_TO_DESK_2:
+    case IDC_MOVE_TO_DESK_3:
+    case IDC_MOVE_TO_DESK_4:
+    case IDC_MOVE_TO_DESK_5:
+    case IDC_MOVE_TO_DESK_6:
+    case IDC_MOVE_TO_DESK_7:
+    case IDC_MOVE_TO_DESK_8:
+      SendToDeskAtIndex(browser_, id - IDC_MOVE_TO_DESK_1);
       break;
     case IDC_TOGGLE_ASSIGN_TO_ALL_DESKS:
       ToggleAssignedToAllDesks(browser_);
@@ -973,16 +973,16 @@ void BrowserCommandController::InitCommandState() {
   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
 
-  // Assign to desks
-  command_updater_.UpdateCommandEnabled(IDC_ASSIGN_TO_DESKS_MENU, true);
-  static_assert(IDC_SEND_TO_DESK_1 == IDC_SEND_TO_DESK_2 - 1 &&
-                    IDC_SEND_TO_DESK_2 == IDC_SEND_TO_DESK_3 - 1 &&
-                    IDC_SEND_TO_DESK_3 == IDC_SEND_TO_DESK_4 - 1 &&
-                    IDC_SEND_TO_DESK_4 == IDC_SEND_TO_DESK_5 - 1 &&
-                    IDC_SEND_TO_DESK_5 == IDC_SEND_TO_DESK_6 - 1 &&
-                    IDC_SEND_TO_DESK_6 == IDC_SEND_TO_DESK_7 - 1 &&
-                    IDC_SEND_TO_DESK_7 == IDC_SEND_TO_DESK_8 - 1,
-                "IDC_SEND_TO_DESK_* commands must be in order.");
+  // Move to desks
+  command_updater_.UpdateCommandEnabled(IDC_MOVE_TO_DESKS_MENU, true);
+  static_assert(IDC_MOVE_TO_DESK_1 == IDC_MOVE_TO_DESK_2 - 1 &&
+                    IDC_MOVE_TO_DESK_2 == IDC_MOVE_TO_DESK_3 - 1 &&
+                    IDC_MOVE_TO_DESK_3 == IDC_MOVE_TO_DESK_4 - 1 &&
+                    IDC_MOVE_TO_DESK_4 == IDC_MOVE_TO_DESK_5 - 1 &&
+                    IDC_MOVE_TO_DESK_5 == IDC_MOVE_TO_DESK_6 - 1 &&
+                    IDC_MOVE_TO_DESK_6 == IDC_MOVE_TO_DESK_7 - 1 &&
+                    IDC_MOVE_TO_DESK_7 == IDC_MOVE_TO_DESK_8 - 1,
+                "IDC_MOVE_TO_DESK_* commands must be in order.");
   auto* desks_helper = ash::DesksHelper::Get();
   UpdateCommandsForDesks(desks_helper ? desks_helper->GetNumberOfDesks() : 1);
   command_updater_.UpdateCommandEnabled(IDC_TOGGLE_ASSIGN_TO_ALL_DESKS, true);
@@ -1457,9 +1457,9 @@ void BrowserCommandController::UpdateCommandsForLockedFullscreenMode() {
 }
 
 void BrowserCommandController::UpdateCommandsForDesks(int num_desks) {
-  constexpr int kMaxNumberOfDesks = IDC_SEND_TO_DESK_8 - IDC_SEND_TO_DESK_1 + 1;
+  constexpr int kMaxNumberOfDesks = IDC_MOVE_TO_DESK_8 - IDC_MOVE_TO_DESK_1 + 1;
   for (int i = 0; i < kMaxNumberOfDesks; ++i) {
-    command_updater_.UpdateCommandEnabled(IDC_SEND_TO_DESK_1 + i,
+    command_updater_.UpdateCommandEnabled(IDC_MOVE_TO_DESK_1 + i,
                                           i < num_desks);
   }
 }

chrome/browser/ui/toolbar/assign_to_desks_menu_model.cc → chrome/browser/ui/toolbar/move_to_desks_menu_model.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/toolbar/assign_to_desks_menu_model.h"
+#include "chrome/browser/ui/toolbar/move_to_desks_menu_model.h"
 
 #include "ash/public/cpp/desks_helper.h"
 #include "chrome/app/chrome_command_ids.h"
@@ -10,51 +10,51 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/widget/widget.h"
 
-AssignToDesksMenuModel::AssignToDesksMenuModel(
+MoveToDesksMenuModel::MoveToDesksMenuModel(
     ui::SimpleMenuModel::Delegate* delegate,
     views::Widget* browser_widget)
     : SimpleMenuModel(delegate),
       desks_helper_(ash::DesksHelper::Get()),
       browser_widget_(browser_widget) {
-  constexpr int kMaxNumberOfDesks = IDC_SEND_TO_DESK_8 - IDC_SEND_TO_DESK_1 + 1;
+  constexpr int kMaxNumberOfDesks = IDC_MOVE_TO_DESK_8 - IDC_MOVE_TO_DESK_1 + 1;
   AddCheckItem(IDC_TOGGLE_ASSIGN_TO_ALL_DESKS,
                l10n_util::GetStringUTF16(IDS_ASSIGN_TO_ALL_DESKS));
   assign_to_all_desks_item_index_ = GetItemCount() - 1;
   AddSeparator(ui::NORMAL_SEPARATOR);
 
-  // Store the number of items that occur before the group of send to desk items
-  // so we can retrieve the send to desk items' indices properly.
-  send_to_desk_group_offset_ = GetItemCount();
+  // Store the number of items that occur before the group of move to desk items
+  // so we can retrieve the move to desk items' indices properly.
+  move_to_desk_group_offset_ = GetItemCount();
   for (int i = 0; i < kMaxNumberOfDesks; ++i)
-    AddCheckItem(IDC_SEND_TO_DESK_1 + i, base::string16());
+    AddCheckItem(IDC_MOVE_TO_DESK_1 + i, base::string16());
 }
 
-bool AssignToDesksMenuModel::IsVisibleAt(int index) const {
+bool MoveToDesksMenuModel::IsVisibleAt(int index) const {
   if (index == assign_to_all_desks_item_index_)
     return true;
-  return OffsetIndexForSendToDeskGroup(index) <
+  return OffsetIndexForMoveToDeskGroup(index) <
          desks_helper_->GetNumberOfDesks();
 }
 
-base::string16 AssignToDesksMenuModel::GetLabelAt(int index) const {
+base::string16 MoveToDesksMenuModel::GetLabelAt(int index) const {
   if (index == assign_to_all_desks_item_index_)
     return l10n_util::GetStringUTF16(IDS_ASSIGN_TO_ALL_DESKS);
-  return desks_helper_->GetDeskName(OffsetIndexForSendToDeskGroup(index));
+  return desks_helper_->GetDeskName(OffsetIndexForMoveToDeskGroup(index));
 }
 
-bool AssignToDesksMenuModel::IsItemCheckedAt(int index) const {
+bool MoveToDesksMenuModel::IsItemCheckedAt(int index) const {
   const bool is_assigned_to_all_desks =
       browser_widget_ && browser_widget_->IsVisibleOnAllWorkspaces();
 
   if (index == assign_to_all_desks_item_index_)
     return is_assigned_to_all_desks;
 
-  return !is_assigned_to_all_desks && OffsetIndexForSendToDeskGroup(index) ==
+  return !is_assigned_to_all_desks && OffsetIndexForMoveToDeskGroup(index) ==
                                           desks_helper_->GetActiveDeskIndex();
 }
 
-int AssignToDesksMenuModel::OffsetIndexForSendToDeskGroup(int index) const {
-  const int send_to_desk_group_index = index - send_to_desk_group_offset_;
-  DCHECK_GE(send_to_desk_group_index, 0);
-  return send_to_desk_group_index;
+int MoveToDesksMenuModel::OffsetIndexForMoveToDeskGroup(int index) const {
+  const int move_to_desk_group_index = index - move_to_desk_group_offset_;
+  DCHECK_GE(move_to_desk_group_index, 0);
+  return move_to_desk_group_index;
 }

chrome/browser/ui/toolbar/assign_to_desks_menu_model.h → chrome/browser/ui/toolbar/move_to_desks_menu_model.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_TOOLBAR_ASSIGN_TO_DESKS_MENU_MODEL_H_
-#define CHROME_BROWSER_UI_TOOLBAR_ASSIGN_TO_DESKS_MENU_MODEL_H_
+#ifndef CHROME_BROWSER_UI_TOOLBAR_MOVE_TO_DESKS_MENU_MODEL_H_
+#define CHROME_BROWSER_UI_TOOLBAR_MOVE_TO_DESKS_MENU_MODEL_H_
 
 #include "ui/base/models/simple_menu_model.h"
 
@@ -15,12 +15,12 @@ namespace views {
 class Widget;
 }
 
-// A menu model that builds the contents of the assign to desks menu.
-class AssignToDesksMenuModel : public ui::SimpleMenuModel {
+// A menu model that builds the contents of the move to desks menu.
+class MoveToDesksMenuModel : public ui::SimpleMenuModel {
  public:
-  AssignToDesksMenuModel(ui::SimpleMenuModel::Delegate* delegate,
-                         views::Widget* browser_widget);
-  ~AssignToDesksMenuModel() override = default;
+  MoveToDesksMenuModel(ui::SimpleMenuModel::Delegate* delegate,
+                       views::Widget* browser_widget);
+  ~MoveToDesksMenuModel() override = default;
 
   // SimpleMenuModel:
   bool IsVisibleAt(int index) const override;
@@ -28,10 +28,10 @@ class AssignToDesksMenuModel : public ui::SimpleMenuModel {
   bool IsItemCheckedAt(int index) const override;
 
  private:
-  // Returns |index| - |send_to_desk_group_offset_|. This value is the relative
-  // index within the group of send to desk items. This value must be greater
+  // Returns |index| - |move_to_desk_group_offset_|. This value is the relative
+  // index within the group of move to desk items. This value must be greater
   // than or equal to 0.
-  int OffsetIndexForSendToDeskGroup(int index) const;
+  int OffsetIndexForMoveToDeskGroup(int index) const;
 
   const ash::DesksHelper* const desks_helper_;
   const views::Widget* const browser_widget_;
@@ -40,8 +40,8 @@ class AssignToDesksMenuModel : public ui::SimpleMenuModel {
   int assign_to_all_desks_item_index_;
 
   // This is the number of items in the menu model that occurs before the group
-  // of send to desk items.
-  int send_to_desk_group_offset_;
+  // of move to desk items.
+  int move_to_desk_group_offset_;
 };
 
-#endif  // CHROME_BROWSER_UI_TOOLBAR_ASSIGN_TO_DESKS_MENU_MODEL_H_
+#endif  // CHROME_BROWSER_UI_TOOLBAR_MOVE_TO_DESKS_MENU_MODEL_H_

chrome/browser/ui/views/frame/system_menu_model_builder.cc

@@ -28,7 +28,7 @@
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_helper.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
-#include "chrome/browser/ui/toolbar/assign_to_desks_menu_model.h"
+#include "chrome/browser/ui/toolbar/move_to_desks_menu_model.h"
 #include "components/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
 #include "components/user_manager/user_manager.h"
@@ -95,7 +95,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
   model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE_WINDOW_MENU);
 #endif
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-  AppendAssignToDesksMenu(model);
+  AppendMoveToDesksMenu(model);
 #endif
   AppendTeleportMenu(model);
   // If it's a regular browser window with tabs, we don't add any more items,
@@ -135,7 +135,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPopupWindow(
   model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
 #endif
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-  AppendAssignToDesksMenu(model);
+  AppendMoveToDesksMenu(model);
 #endif
   AppendTeleportMenu(model);
 }
@@ -150,17 +150,16 @@ void SystemMenuModelBuilder::AddFrameToggleItems(ui::SimpleMenuModel* model) {
 }
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-void SystemMenuModelBuilder::AppendAssignToDesksMenu(
-    ui::SimpleMenuModel* model) {
+void SystemMenuModelBuilder::AppendMoveToDesksMenu(ui::SimpleMenuModel* model) {
   if (ash::features::IsBentoEnabled()) {
     model->AddSeparator(ui::NORMAL_SEPARATOR);
-    assign_to_desks_model_ = std::make_unique<AssignToDesksMenuModel>(
+    move_to_desks_model_ = std::make_unique<MoveToDesksMenuModel>(
         &menu_delegate_,
         views::Widget::GetWidgetForNativeWindow(
             menu_delegate_.browser()->window()->GetNativeWindow()));
-    model->AddSubMenuWithStringId(IDC_ASSIGN_TO_DESKS_MENU,
-                                  IDS_ASSIGN_TO_DESKS_MENU,
-                                  assign_to_desks_model_.get());
+    model->AddSubMenuWithStringId(IDC_MOVE_TO_DESKS_MENU,
+                                  IDS_MOVE_TO_DESKS_MENU,
+                                  move_to_desks_model_.get());
   }
 }
 #endif

chrome/browser/ui/views/frame/system_menu_model_builder.h

@@ -12,7 +12,7 @@
 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-class AssignToDesksMenuModel;
+class MoveToDesksMenuModel;
 #endif
 class Browser;
 class ZoomMenuModel;
@@ -48,8 +48,8 @@ class SystemMenuModelBuilder {
   void AddFrameToggleItems(ui::SimpleMenuModel* model);
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-  // Add the submenu for assign to desks.
-  void AppendAssignToDesksMenu(ui::SimpleMenuModel* model);
+  // Add the submenu for move to desks.
+  void AppendMoveToDesksMenu(ui::SimpleMenuModel* model);
 #endif
 
   // Add the items to allow the window to visit the desktop of another user.
@@ -59,7 +59,7 @@ class SystemMenuModelBuilder {
   std::unique_ptr<ui::MenuModel> menu_model_;
   std::unique_ptr<ZoomMenuModel> zoom_menu_contents_;
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-  std::unique_ptr<AssignToDesksMenuModel> assign_to_desks_model_;
+  std::unique_ptr<MoveToDesksMenuModel> move_to_desks_model_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SystemMenuModelBuilder);

chrome/browser/ui/web_applications/web_app_menu_model.cc

@@ -27,7 +27,7 @@
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "ash/public/cpp/ash_features.h"
-#include "chrome/browser/ui/toolbar/assign_to_desks_menu_model.h"
+#include "chrome/browser/ui/toolbar/move_to_desks_menu_model.h"
 #include "ui/views/widget/widget.h"
 #endif
 
@@ -98,11 +98,11 @@ void WebAppMenuModel::Build() {
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   if (ash::features::IsBentoEnabled()) {
     AddSeparator(ui::NORMAL_SEPARATOR);
-    assign_to_desks_submenu_ = std::make_unique<AssignToDesksMenuModel>(
+    move_to_desks_submenu_ = std::make_unique<MoveToDesksMenuModel>(
         this, views::Widget::GetWidgetForNativeWindow(
                   browser()->window()->GetNativeWindow()));
-    AddSubMenuWithStringId(IDC_ASSIGN_TO_DESKS_MENU, IDS_ASSIGN_TO_DESKS_MENU,
-                           assign_to_desks_submenu_.get());
+    AddSubMenuWithStringId(IDC_MOVE_TO_DESKS_MENU, IDS_MOVE_TO_DESKS_MENU,
+                           move_to_desks_submenu_.get());
   }
 #endif
 

chrome/browser/ui/web_applications/web_app_menu_model.h

@@ -8,7 +8,7 @@
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
 
-class AssignToDesksMenuModel;
+class MoveToDesksMenuModel;
 
 // Menu model for the menu button in a web app browser window.
 class WebAppMenuModel : public AppMenuModel {
@@ -32,7 +32,7 @@ class WebAppMenuModel : public AppMenuModel {
 
  private:
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-  std::unique_ptr<AssignToDesksMenuModel> assign_to_desks_submenu_;
+  std::unique_ptr<MoveToDesksMenuModel> move_to_desks_submenu_;
 #endif
 };