Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller.cc

Issue 10391158: Moves methods for finding browsers to browser_finder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include fixs Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/intents/web_intent_picker_controller.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index 1802c564946cb74f3c16c30696e5e0588250e0ff..f59d8ec04a9da02e30f1c6d4e3e3fac008b3b0c9 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/tab_util.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/intents/web_intent_picker.h"
@@ -263,7 +264,7 @@ void WebIntentPickerController::OnServiceChosen(const GURL& url,
case WebIntentPickerModel::DISPOSITION_WINDOW: {
int index = TabStripModel::kNoTab;
- Browser* browser = Browser::GetBrowserForController(
+ Browser* browser = browser::FindBrowserForController(
&wrapper_->web_contents()->GetController(), &index);
TabContentsWrapper* contents = Browser::TabContentsFactory(
wrapper_->profile(),
@@ -319,7 +320,7 @@ void WebIntentPickerController::OnExtensionInstallRequested(
void WebIntentPickerController::OnExtensionLinkClicked(const std::string& id) {
// Navigate from source tab.
Browser* browser =
- BrowserList::FindBrowserWithWebContents(wrapper_->web_contents());
+ browser::FindBrowserWithWebContents(wrapper_->web_contents());
GURL extension_url(extension_urls::GetWebstoreItemDetailURLPrefix() + id);
browser::NavigateParams params(browser, extension_url,
content::PAGE_TRANSITION_AUTO_BOOKMARK);
@@ -330,7 +331,7 @@ void WebIntentPickerController::OnExtensionLinkClicked(const std::string& id) {
void WebIntentPickerController::OnSuggestionsLinkClicked() {
// Navigate from source tab.
Browser* browser =
- BrowserList::FindBrowserWithWebContents(wrapper_->web_contents());
+ browser::FindBrowserWithWebContents(wrapper_->web_contents());
GURL query_url = extension_urls::GetWebstoreIntentQueryURL(
UTF16ToUTF8(picker_model_->action()),
UTF16ToUTF8(picker_model_->mimetype()));
@@ -395,7 +396,7 @@ void WebIntentPickerController::OnSendReturnMessage(
if (service_tab_ &&
reply_type != webkit_glue::WEB_INTENT_SERVICE_CONTENTS_CLOSED) {
int index = TabStripModel::kNoTab;
- Browser* browser = Browser::GetBrowserForController(
+ Browser* browser = browser::FindBrowserForController(
&service_tab_->GetController(), &index);
if (browser) {
browser->tab_strip_model()->CloseTabContentsAt(
@@ -403,7 +404,7 @@ void WebIntentPickerController::OnSendReturnMessage(
// Activate source tab.
Browser* source_browser =
- BrowserList::FindBrowserWithWebContents(wrapper_->web_contents());
+ browser::FindBrowserWithWebContents(wrapper_->web_contents());
if (source_browser) {
int source_index =
source_browser->tab_strip_model()->GetIndexOfTabContents(wrapper_);

Powered by Google App Engine
This is Rietveld 408576698