Moves accelerator registration to WindowManager

mandoline/ui/desktop_ui/browser_window.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mandoline/ui/desktop_ui/browser_window.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 19 matching lines @@
 #include "ui/mojo/init/ui_init.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/display_converter.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mandoline {
+namespace {
+
+void OnAcceleratorAdded(bool success) {
+  DCHECK(success);
+}
+
+}  // namespace
 
 class ProgressView : public views::View {
  public:
   ProgressView() : progress_(0.f), loading_(false) {}
   ~ProgressView() override {}
 
   void SetProgress(double progress) {
     progress_ = progress;
     SchedulePaint();
   }
@@ skipping 44 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(LayoutManagerImpl);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserWindow, public:
 
 BrowserWindow::BrowserWindow(mojo::ApplicationImpl* app,
                              mus::mojom::WindowTreeHostFactory* host_factory,
                              BrowserManager* manager)
     : app_(app),
-      host_client_binding_(this),
+      window_manager_client_(nullptr),
       manager_(manager),
       toolbar_view_(nullptr),
       progress_bar_(nullptr),
       find_bar_view_(nullptr),
       root_(nullptr),
       content_(nullptr),
       omnibox_view_(nullptr),
       find_active_(0),
       find_count_(0),
       web_view_(this) {
-  mus::CreateWindowTreeHost(host_factory,
-                            host_client_binding_.CreateInterfacePtrAndBind(),
-                            this, &host_, nullptr);
+  mus::CreateWindowTreeHost(host_factory, nullptr, this, &host_, this);
 }
 
 void BrowserWindow::LoadURL(const GURL& url) {
   // Haven't been embedded yet, can't embed.
   // TODO(beng): remove this.
   if (!root_) {
     default_url_ = url;
     return;
   }
 
@@ skipping 74 matching lines @@
   Init(root_);
 
   host_->SetSize(mojo::Size::From(gfx::Size(1280, 800)));
 
   root_->AddChild(content_);
   host_->AddActivationParent(root_->id());
   content_->SetVisible(true);
 
   web_view_.Init(app_, content_);
 
-  host_->AddAccelerator(
+  const base::Callback<void(bool)> add_accelerator_callback =
+      base::Bind(&OnAcceleratorAdded);
+  DCHECK(window_manager_client_);
+  window_manager_client_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::CLOSE),
       mus::CreateKeyMatcher(mus::mojom::KeyboardCode::W,
                             mus::mojom::kEventFlagControlDown),
-      mus::mojom::WindowTreeHost::AddAcceleratorCallback());
-  host_->AddAccelerator(
+      add_accelerator_callback);
+  window_manager_client_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::FOCUS_OMNIBOX),
       mus::CreateKeyMatcher(mus::mojom::KeyboardCode::L,
                             mus::mojom::kEventFlagControlDown),
-      mus::mojom::WindowTreeHost::AddAcceleratorCallback());
-  host_->AddAccelerator(
+      add_accelerator_callback);
+  window_manager_client_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::NEW_WINDOW),
       mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
                             mus::mojom::kEventFlagControlDown),
-      mus::mojom::WindowTreeHost::AddAcceleratorCallback());
-  host_->AddAccelerator(
+      add_accelerator_callback);
+  window_manager_client_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::SHOW_FIND),
       mus::CreateKeyMatcher(mus::mojom::KeyboardCode::F,
                             mus::mojom::kEventFlagControlDown),
-      mus::mojom::WindowTreeHost::AddAcceleratorCallback());
-  host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::GO_BACK),
-                        mus::CreateKeyMatcher(mus::mojom::KeyboardCode::LEFT,
-                                              mus::mojom::kEventFlagAltDown),
-                        mus::mojom::WindowTreeHost::AddAcceleratorCallback());
-  host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::GO_FORWARD),
-                        mus::CreateKeyMatcher(mus::mojom::KeyboardCode::RIGHT,
-                                              mus::mojom::kEventFlagAltDown),
-                        mus::mojom::WindowTreeHost::AddAcceleratorCallback());
+      add_accelerator_callback);
+  window_manager_client_->AddAccelerator(
+      static_cast<uint32_t>(BrowserCommand::GO_BACK),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::LEFT,
+                            mus::mojom::kEventFlagAltDown),
+      add_accelerator_callback);
+  window_manager_client_->AddAccelerator(
+      static_cast<uint32_t>(BrowserCommand::GO_FORWARD),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::RIGHT,
+                            mus::mojom::kEventFlagAltDown),
+      add_accelerator_callback);
+
   // Now that we're ready, load the default url.
   LoadURL(default_url_);
 
   // Record the time spent opening initial tabs, used for performance testing.
   const base::TimeDelta open_tabs_delta =
       base::TimeTicks::Now() - display_ticks;
 
   // Record the browser startup time metrics, used for performance testing.
   static bool recorded_browser_startup_metrics = false;
   if (!recorded_browser_startup_metrics &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           tracing::kEnableStatsCollectionBindings)) {
     tracing::StartupPerformanceDataCollectorPtr collector;
     app_->ConnectToService("mojo:tracing", &collector);
     collector->SetBrowserWindowDisplayTicks(display_ticks.ToInternalValue());
     collector->SetBrowserOpenTabsTimeDelta(open_tabs_delta.ToInternalValue());
     collector->SetBrowserMessageLoopStartTicks(
         manager_->startup_ticks().ToInternalValue());
     recorded_browser_startup_metrics = true;
   }
 }
 
 void BrowserWindow::OnConnectionLost(mus::WindowTreeConnection* connection) {
   root_ = nullptr;
   delete this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// BrowserWindow, mus::ViewTreeHostClient implementation:
+// BrowserWindow, mus::WindowManagerDelegate implementation:
+
+void BrowserWindow::SetWindowManagerClient(mus::WindowManagerClient* client) {
+  window_manager_client_ = client;
+}
+
+bool BrowserWindow::OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) {
+  return true;
+}
+
+bool BrowserWindow::OnWmSetProperty(
+    mus::Window* window,
+    const std::string& name,
+    scoped_ptr<std::vector<uint8_t>>* new_data) {
+  return true;
+}
+
+mus::Window* BrowserWindow::OnWmCreateTopLevelWindow(
+    std::map<std::string, std::vector<uint8_t>>* properties) {
+  NOTREACHED();
+  return nullptr;
+}
 
 void BrowserWindow::OnAccelerator(uint32_t id, mus::mojom::EventPtr event) {
   switch (static_cast<BrowserCommand>(id)) {
     case BrowserCommand::CLOSE:
       Close();
       break;
     case BrowserCommand::NEW_WINDOW:
       manager_->CreateBrowser(GURL());
       break;
     case BrowserCommand::FOCUS_OMNIBOX:
@@ skipping 171 matching lines @@
   content_bounds.set_width(DIPSToPixels(progress_bar_bounds.width()));
   content_bounds.set_height(host->bounds().height() - content_bounds.y() -
                             DIPSToPixels(10));
   content_->SetBounds(content_bounds);
 
   // The omnibox view bounds are in physical pixels.
   omnibox_view_->SetBounds(bounds_in_physical_pixels);
 }
 
 }  // namespace mandoline