Make app list start page doodle clickable and have alt text.

chrome/browser/ui/app_list/start_page_service.cc

 // Copyright 2013 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 "chrome/browser/ui/app_list/start_page_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/user_metrics.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_profile_helper.h"
 #include "chrome/browser/media/media_stream_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/browser/ui/app_list/speech_auth_helper.h"
 #include "chrome/browser/ui/app_list/speech_recognizer.h"
 #include "chrome/browser/ui/app_list/start_page_observer.h"
 #include "chrome/browser/ui/app_list/start_page_service_factory.h"
+#include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/ui/zoom/zoom_controller.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 64 matching lines @@
 
   StartPageService* service_;  // Owner of this class.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileDestroyObserver);
 };
 
 class StartPageService::StartPageWebContentsDelegate
     : public content::WebContentsDelegate {
  public:
-  StartPageWebContentsDelegate() {}
+  explicit StartPageWebContentsDelegate(Profile* profile) : profile_(profile) {}
   ~StartPageWebContentsDelegate() override {}
 
   void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) override {
     if (MediaStreamInfoBarDelegate::Create(web_contents, request, callback))
       NOTREACHED() << "Media stream not allowed for WebUI";
   }
 
   bool CheckMediaAccessPermission(content::WebContents* web_contents,
                                   const GURL& security_origin,
                                   content::MediaStreamType type) override {
     return MediaCaptureDevicesDispatcher::GetInstance()
         ->CheckMediaAccessPermission(web_contents, security_origin, type);
   }
 
+  void AddNewContents(content::WebContents* source,
+                      content::WebContents* new_contents,
+                      WindowOpenDisposition disposition,
+                      const gfx::Rect& initial_pos,
+                      bool user_gesture,
+                      bool* was_blocked) override {
+    chrome::ScopedTabbedBrowserDisplayer displayer(
+        profile_, chrome::GetActiveDesktop());
+    // Force all links to open in a new tab, even if they were trying to open a
+    // new window.
+    disposition =
+        disposition == NEW_BACKGROUND_TAB ? disposition : NEW_FOREGROUND_TAB;
+    chrome::AddWebContents(displayer.browser(),
+                           NULL,

[Matt Giuca, 2015/02/03 07:08:50]

nullptr

[calamity, 2015/02/04 03:16:22]

Done.

+                           new_contents,
+                           disposition,
+                           initial_pos,
+                           user_gesture,
+                           was_blocked);
+  }
+
+  content::WebContents* OpenURLFromTab(
+      content::WebContents* source,
+      const content::OpenURLParams& params) override {
+    // Force all links to open in a new tab, even if they were trying to open a
+    // window.
+    chrome::NavigateParams new_tab_params(
+        static_cast<Browser*>(NULL), params.url, params.transition);

[Matt Giuca, 2015/02/03 07:08:50]

nullptr

[calamity, 2015/02/04 03:16:22]

Done.

+    if (params.disposition == NEW_BACKGROUND_TAB) {
+      new_tab_params.disposition = NEW_BACKGROUND_TAB;
+    } else {
+      new_tab_params.disposition = NEW_FOREGROUND_TAB;
+      new_tab_params.window_action = chrome::NavigateParams::SHOW_WINDOW;
+    }
+
+    new_tab_params.initiating_profile = profile_;
+    chrome::Navigate(&new_tab_params);
+
+    return new_tab_params.target_contents;
+  }
+
  private:
+  Profile* profile_;
+
   DISALLOW_COPY_AND_ASSIGN(StartPageWebContentsDelegate);
 };
 
 #if defined(OS_CHROMEOS)
 
 class StartPageService::AudioStatus
     : public chromeos::CrasAudioHandler::AudioObserver {
  public:
   explicit AudioStatus(StartPageService* start_page_service)
       : start_page_service_(start_page_service) {
@@ skipping 352 matching lines @@
   for (const auto& cb : pending_webui_callbacks_)
     cb.Run();
   pending_webui_callbacks_.clear();
 
   FetchDoodleJson();
 }
 
 void StartPageService::LoadContents() {
   contents_.reset(content::WebContents::Create(
       content::WebContents::CreateParams(profile_)));
-  contents_delegate_.reset(new StartPageWebContentsDelegate());
+  contents_delegate_.reset(new StartPageWebContentsDelegate(profile_));
   contents_->SetDelegate(contents_delegate_.get());
 
   // The ZoomController needs to be created before the web contents is observed
   // by this object. Otherwise it will react to DidNavigateMainFrame after this
   // object does, resetting the zoom mode in the process.
   ui_zoom::ZoomController::CreateForWebContents(contents_.get());
   Observe(contents_.get());
 
   contents_->GetController().LoadURL(
       GURL(chrome::kChromeUIAppListStartPageURL),
@@ skipping 58 matching lines @@
 
   // Check for a new doodle.
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&StartPageService::FetchDoodleJson,
                  weak_factory_.GetWeakPtr()),
       recheck_delay);
 }
 
 }  // namespace app_list