Adds support for new-tab targeted loads initiated from the renderer.

mash/browser/browser.cc

 // Copyright 2016 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 "mash/browser/browser.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 75 matching lines @@
 
     Tab* tab_;
 
     DISALLOW_COPY_AND_ASSIGN(Background);
   };
 
   Tab(std::unique_ptr<navigation::View> view,
       views::ButtonListener* listener)
       : views::LabelButton(listener, base::ASCIIToUTF16("Blank")),
         view_(std::move(view)) {
-    view_->SetResizerSize(gfx::Size(16, 16));
     view_->AddObserver(this);
     set_background(new Background(this));
   }
   ~Tab() override {
     view_->RemoveObserver(this);
   }
 
   bool selected() const { return selected_; }
 
   mus::Window* window() { return window_; }
@@ skipping 119 matching lines @@
     if (tab_index < selected_index_)
       --selected_index_;
     DCHECK(it != tabs_.end());
     tabs_.erase(it);
     RemoveObserver(tab);
     tab_container_->RemoveChildView(tab);
     if (tab->selected()) {
       int next_selected_index = selected_index_;
       if (selected_index_ == static_cast<int>(tabs_.size()))
         --next_selected_index;
-      SelectTab(tabs_[next_selected_index]);
+      if (next_selected_index >= 0)
+        SelectTab(tabs_[next_selected_index]);
     }
     Layout();
     FOR_EACH_OBSERVER(TabStripObserver, observers_, OnTabRemoved(tab));
     delete tab;
   }
 
   bool empty() const { return tabs_.empty(); }
 
   void SelectTab(Tab* tab) {
     auto it = std::find(tabs_.begin(), tabs_.end(), tab);
@@ skipping 467 matching lines @@
     if (GetWidget())
       GetWidget()->UpdateWindowTitle();
   }
 
   // navigation::ViewDelegate:
   void ViewCreated(navigation::View* source,
                    std::unique_ptr<navigation::View> view,
                    bool is_popup,
                    const gfx::Rect& initial_rect,
                    bool user_gesture) override {
-    if (is_popup) {
-      views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
-          new UI(browser_, is_popup ? UI::Type::POPUP : UI::Type::WINDOW,
-                 std::move(view)),
-          nullptr, initial_rect);
-      window->Show();
-      browser_->AddWindow(window);
-    } else {
+    if (is_popup)
+      CreateNewWindow(std::move(view), initial_rect, is_popup);
+    else
       tab_strip_->AddTab(std::move(view));
-    }
   }
   void Close(navigation::View* source) override {
     tab_strip_->CloseTabForView(source);
     if (tab_strip_->empty())
       GetWidget()->Close();
   }
+  void OpenURL(navigation::View* source,
+               navigation::mojom::OpenURLParamsPtr params) override {
+    switch (params->disposition) {
+      case navigation::mojom::WindowOpenDisposition::CURRENT_TAB:
+        selected_view()->NavigateToURL(params->url);
+        break;
+      case navigation::mojom::WindowOpenDisposition::NEW_FOREGROUND_TAB:
+        tab_strip_->AddTab(browser_->CreateView());
+        tab_strip_->selected_tab()->view()->NavigateToURL(params->url);
+        break;
+      case navigation::mojom::WindowOpenDisposition::NEW_POPUP:
+      case navigation::mojom::WindowOpenDisposition::NEW_WINDOW: {
+        std::unique_ptr<navigation::View> view = browser_->CreateView();
+        view->NavigateToURL(params->url);
+        CreateNewWindow(
+            std::move(view), gfx::Rect(),
+            params->disposition ==
+                navigation::mojom::WindowOpenDisposition::NEW_POPUP);
+        break;
+      }
+      default:
+        break;
+    }
+  }
 
   // navigation::ViewObserver:
   void LoadingStateChanged(navigation::View* view) override {
     if (view->is_loading()) {
       reload_button_->SetText(base::ASCIIToUTF16("Stop"));
       throbber_->Start();
     } else {
       reload_button_->SetText(base::ASCIIToUTF16("Reload"));
       throbber_->Stop();
       progress_bar_->SetProgress(0.f);
@@ skipping 33 matching lines @@
   }
 
   navigation::View* selected_view() {
     return const_cast<navigation::View*>(
         static_cast<const UI*>(this)->selected_view());
   }
   const navigation::View* selected_view() const {
     return tab_strip_->selected_tab()->view();
   }
 
+  void CreateNewWindow(std::unique_ptr<navigation::View> view,
+                       const gfx::Rect& initial_bounds,
+                       bool is_popup) {
+    gfx::Rect bounds = initial_bounds;
+    if (bounds.IsEmpty())
+      bounds = gfx::Rect(10, 10, 400, 300);
+    views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
+        new UI(browser_, is_popup ? UI::Type::POPUP : UI::Type::WINDOW,
+               std::move(view)),
+        nullptr, bounds);
+    window->Show();
+    browser_->AddWindow(window);
+  }
+
   void ToggleDebugView() {
     showing_debug_view_ = !showing_debug_view_;
     Layout();
   }
 
   Browser* browser_;
 
   Type type_;
 
   TabStrip* tab_strip_;
@@ skipping 66 matching lines @@
   AddWindow(window);
 }
 
 void Browser::Create(shell::Connection* connection,
                      mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace browser
 }  // namespace mash