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

Unified Diff: chrome/browser/extensions/api/omnibox/omnibox_api.cc

Issue 11418043: Remove TabContents from OmniboxEditController and friends. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros Created 8 years, 1 month 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/extensions/api/omnibox/omnibox_api.cc
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index fd225442d3c8c94ae98355bc69860143087b2c16..6c170d14c6960dc36c4d221f4f1ea879da1f164c 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/extension_constants.h"
#include "content/public/browser/notification_service.h"
@@ -77,16 +76,17 @@ bool ExtensionOmniboxEventRouter::OnInputChanged(
// static
void ExtensionOmniboxEventRouter::OnInputEntered(
- TabContents* tab_contents,
+ content::WebContents* web_contents,
const std::string& extension_id,
const std::string& input) {
- Profile* profile = tab_contents->profile();
+ Profile* profile =
+ Profile::FromBrowserContext(web_contents->GetBrowserContext());
const Extension* extension =
ExtensionSystem::Get(profile)->extension_service()->extensions()->
GetByID(extension_id);
CHECK(extension);
- extensions::TabHelper::FromWebContents(tab_contents->web_contents())->
+ extensions::TabHelper::FromWebContents(web_contents)->
active_tab_permission_granter()->GrantIfRequested(extension);
scoped_ptr<ListValue> args(new ListValue());

Powered by Google App Engine
This is Rietveld 408576698