Move Commander to namespace

brave · Feb 6, 2023 · 1f9437d · 1f9437d
1 parent 5a3b0ca
commit 1f9437d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/browser/ui/commander/command_centre.cc b/browser/ui/commander/command_centre.cc
@@ -32,9 +32,8 @@ CommandItemModel FromViewModel(const CommandItemViewModel& model) {
   return CommandItemModel(model.title, model.matched_ranges, model.annotation);
 }
 }  // namespace
-}  // namespace commander
 
-CommandCentre::CommandCentre(commander::CommanderBackend* backend)
+CommandCentre::CommandCentre(CommanderBackend* backend)
     : backend_(backend) {
   SetInstance(this);
   backend_->SetUpdateCallback(base::BindRepeating(
@@ -61,7 +60,7 @@ void CommandCentre::UpdateText(bool force) {
   }
   auto text = browser->window()->GetLocationBar()->GetOmniboxView()->GetText();
 
-  if (!base::StartsWith(text, commander::kCommandPrefix)) {
+  if (!base::StartsWith(text, kCommandPrefix)) {
     return;
   }
 
@@ -81,7 +80,7 @@ void CommandCentre::SelectCommand(uint32_t command_index,
   backend_->OnCommandSelected(command_index, result_set_id);
 }
 
-const std::vector<commander::CommandItemModel>& CommandCentre::GetItems() {
+const std::vector<CommandItemModel>& CommandCentre::GetItems() {
   return items_;
 }
 
@@ -131,23 +130,23 @@ OmniboxView* CommandCentre::GetOmnibox() const {
 }
 
 bool CommandCentre::IsShowing() const {
-  return GetOmnibox()->GetText().starts_with(commander::kCommandPrefix);
+  return GetOmnibox()->GetText().starts_with(kCommandPrefix);
 }
 
-void CommandCentre::OnViewModelUpdated(commander::CommanderViewModel vm) {
+void CommandCentre::OnViewModelUpdated(CommanderViewModel vm) {
   result_set_id_ = vm.result_set_id;
 
   items_.clear();
   items_.reserve(vm.items.size());
   for (const auto& item : vm.items) {
-    items_.push_back(commander::FromViewModel(item));
+    items_.push_back(FromViewModel(item));
   }
 
-  if (vm.action == commander::CommanderViewModel::kPrompt) {
+  if (vm.action == CommanderViewModel::kPrompt) {
     prompt_ = vm.prompt_text;
     last_searched_.clear();
     Show();
-  } else if (vm.action == commander::CommanderViewModel::kClose) {
+  } else if (vm.action == CommanderViewModel::kClose) {
     Hide();
     prompt_.clear();
     last_searched_.clear();
@@ -159,7 +158,8 @@ void CommandCentre::OnViewModelUpdated(commander::CommanderViewModel vm) {
 }
 
 // static
-std::unique_ptr<commander::CommanderFrontend>
-commander::CommanderFrontend::Create(commander::CommanderBackend* backend) {
+std::unique_ptr<CommanderFrontend>
+CommanderFrontend::Create(CommanderBackend* backend) {
   return std::make_unique<CommandCentre>(backend);
 }
+}  // namespace commander
diff --git a/browser/ui/commander/command_centre.h b/browser/ui/commander/command_centre.h
@@ -18,42 +18,45 @@
 #include "chrome/browser/ui/commander/commander_view_model.h"
 
 class OmniboxView;
-class CommandCentre : public commander::CommanderFrontend,
-                      public commander::CommanderFrontendDelegate {
+
+namespace commander {
+class CommandCentre : public CommanderFrontend,
+                      public CommanderFrontendDelegate {
  public:
-  explicit CommandCentre(commander::CommanderBackend* backend);
+  explicit CommandCentre(CommanderBackend* backend);
   CommandCentre(const CommandCentre&) = delete;
   CommandCentre& operator=(const CommandCentre&) = delete;
   ~CommandCentre() override;
 
-  // commander::CommanderFrontend:
+  // CommanderFrontend:
   void ToggleForBrowser(Browser* browser = nullptr) override;
   void Show(Browser* browser = nullptr) override;
   void Hide() override;
 
-  // commander::CommanderFrontendDelegate:
+  // CommanderFrontendDelegate:
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
   void UpdateText(bool force = false);
   void SelectCommand(uint32_t command_index, uint32_t result_set_id) override;
-  const std::vector<commander::CommandItemModel>& GetItems() override;
+  const std::vector<CommandItemModel>& GetItems() override;
   int GetResultSetId() override;
   const std::u16string& GetPrompt() override;
 
  private:
   OmniboxView* GetOmnibox() const;
   bool IsShowing() const;
-  void OnViewModelUpdated(commander::CommanderViewModel model);
+  void OnViewModelUpdated(CommanderViewModel model);
 
   std::u16string last_searched_;
   std::u16string prompt_;
-  std::vector<commander::CommandItemModel> items_;
+  std::vector<CommandItemModel> items_;
   int result_set_id_;
 
   raw_ptr<Browser> last_browser_;
-  raw_ptr<commander::CommanderBackend> backend_;
+  raw_ptr<CommanderBackend> backend_;
   base::ObserverList<Observer> observers_;
   base::WeakPtrFactory<CommandCentre> weak_ptr_factory_{this};
 };
+}  // namespace commander
 
 #endif  // BRAVE_BROWSER_UI_COMMANDER_COMMAND_CENTRE_H_
diff --git a/browser/ui/views/location_bar/brave_location_bar_view.cc b/browser/ui/views/location_bar/brave_location_bar_view.cc
@@ -323,7 +323,7 @@ BraveLocationBarView::GetContentSettingsImageViewForTesting(size_t idx) {
 
 void BraveLocationBarView::MaybeUpdateCommander() {
   if (commander::IsEnabled()) {
-    static_cast<CommandCentre*>(commander::Commander::Get()->frontend())
+    static_cast<commander::CommandCentre*>(commander::Commander::Get()->frontend())
         ->UpdateText();
   }
 }