Introduce OpenURL to AppListControllerDelegate.

chrome/browser/ui/app_list/search/people/people_result.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/search/people/people_result.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/search/common/url_icon_source.h"
 #include "chrome/browser/ui/app_list/search/people/person.h"
 #include "chrome/browser/ui/app_list/search/search_util.h"
-#include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/common/extensions/api/hangouts_private.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/browser/event_router.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ skipping 25 matching lines @@
   if (image_filename.empty())
     return url;
 
   return url.Resolve(kImageSizePath + image_filename);
 }
 
 }  // namespace
 
 namespace app_list {
 
-PeopleResult::PeopleResult(Profile* profile, scoped_ptr<Person> person)
-    : profile_(profile), person_(person.Pass()), weak_factory_(this) {
+PeopleResult::PeopleResult(Profile* profile,
+                           AppListControllerDelegate* controller,
+                           scoped_ptr<Person> person)
+    : profile_(profile),
+      controller_(controller),
+      person_(person.Pass()),
+      weak_factory_(this) {
   set_id(person_->id);
   set_title(base::UTF8ToUTF16(person_->display_name));
   set_relevance(person_->interaction_rank);
   set_details(base::UTF8ToUTF16(person_->email));
 
   RefreshHangoutsExtensionId();
   SetDefaultActions();
 
   int icon_size = GetPreferredIconDimension();
   image_ = gfx::ImageSkia(
@@ skipping 31 matching lines @@
         SendEmail();
         break;
       default:
         LOG(ERROR) << "Invalid people search action: " << action_index;
     }
   }
 }
 
 scoped_ptr<SearchResult> PeopleResult::Duplicate() {
   return scoped_ptr<SearchResult>(
-      new PeopleResult(profile_, person_->Duplicate().Pass()));
+      new PeopleResult(profile_, controller_, person_->Duplicate().Pass()));
 }
 
 void PeopleResult::OnIconLoaded() {
   // Remove the existing image reps since the icon data is loaded and they
   // need to be re-created.
   const std::vector<gfx::ImageSkiaRep>& image_reps = image_.image_reps();
   for (size_t i = 0; i < image_reps.size(); ++i)
     image_.RemoveRepresentation(image_reps[i].scale());
 
   SetIcon(image_);
@@ skipping 40 matching lines @@
 
   // TODO(rkc): Change this once we remove the hangoutsPrivate API.
   // See crbug.com/306672
   extensions::EventRouter::Get(profile_)
       ->DispatchEventToExtension(hangouts_extension_id_, event.Pass());
 
   content::RecordAction(base::UserMetricsAction("PeopleSearch_OpenChat"));
 }
 
 void PeopleResult::SendEmail() {
-  chrome::NavigateParams params(profile_,
-                                GURL(kEmailUrlPrefix + person_->email),
-                                ui::PAGE_TRANSITION_LINK);
-  // If no window exists, this will open a new window this one tab.
-  params.disposition = NEW_FOREGROUND_TAB;
-  chrome::Navigate(&params);
+  controller_->OpenURL(profile_,
+                       GURL(kEmailUrlPrefix + person_->email),
+                       ui::PAGE_TRANSITION_LINK,
+                       NEW_FOREGROUND_TAB);
   content::RecordAction(base::UserMetricsAction("PeopleSearch_SendEmail"));
 }
 
 void PeopleResult::RefreshHangoutsExtensionId() {
   // TODO(rkc): Change this once we remove the hangoutsPrivate API.
   // See crbug.com/306672
   for (size_t i = 0; i < arraysize(kHangoutsExtensionIds); ++i) {
     if (extensions::EventRouter::Get(profile_)->ExtensionHasEventListener(
             kHangoutsExtensionIds[i], OnHangoutRequested::kEventName)) {
       hangouts_extension_id_ = kHangoutsExtensionIds[i];
       return;
     }
   }
   hangouts_extension_id_.clear();
 }
 
 }  // namespace app_list