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

Unified Diff: chrome/browser/ui/ash/app_list/search_builder.cc

Issue 10825317: Convert banned calls to use Navigate in ash app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 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
« no previous file with comments | « chrome/browser/ui/ash/app_list/extension_app_item.cc ('k') | chrome/browser/ui/browser_navigator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/app_list/search_builder.cc
diff --git a/chrome/browser/ui/ash/app_list/search_builder.cc b/chrome/browser/ui/ash/app_list/search_builder.cc
index 11b84b848f07012a5db07a19f659740135bfacd4..9edb533821b1d6e7a7fd274931bb58f653a6758f 100644
--- a/chrome/browser/ui/ash/app_list/search_builder.cc
+++ b/chrome/browser/ui/ash/app_list/search_builder.cc
@@ -18,7 +18,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/ash/extension_utils.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_icon_set.h"
@@ -245,27 +245,12 @@ void SearchBuilder::OpenResult(const app_list::SearchResult& result,
extension_utils::OpenExtension(profile_, extension, event_flags);
}
} else {
- WindowOpenDisposition disposition =
- chrome::DispositionFromEventFlags(event_flags);
- Browser* browser = browser::FindOrCreateTabbedBrowser(profile_);
-
- if (disposition == CURRENT_TAB) {
- // If current tab is not NTP, change disposition to NEW_FOREGROUND_TAB.
- const GURL& url = chrome::GetActiveWebContents(browser) ?
- chrome::GetActiveWebContents(browser)->GetURL() : GURL();
- if (!url.SchemeIs(chrome::kChromeUIScheme) ||
- url.host() != chrome::kChromeUINewTabHost) {
- disposition = NEW_FOREGROUND_TAB;
- }
- }
-
// TODO(xiyuan): What should we do for alternate url case?
- browser->OpenURL(
- content::OpenURLParams(match.destination_url,
- content::Referrer(),
- disposition,
- match.transition,
- false));
+ chrome::NavigateParams params(profile_,
+ match.destination_url,
+ match.transition);
+ params.disposition = chrome::DispositionFromEventFlags(event_flags);
+ chrome::Navigate(&params);
}
}
« no previous file with comments | « chrome/browser/ui/ash/app_list/extension_app_item.cc ('k') | chrome/browser/ui/browser_navigator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698