chrome/browser/extensions/extension_context_menu_model.cc - Issue 10912156: Move SessionID, CaptureVisibleTabFunction to WebContents.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_context_menu_model.cc

Issue 10912156: Move SessionID, CaptureVisibleTabFunction to WebContents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase atop the extension tab helper change Created 8 years, 3 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:

Index: chrome/browser/extensions/extension_context_menu_model.cc

diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc

index 91b3d275c9b8537ba61dd9c37cec3eccf45fa6ae..f80437d88fa27d7a3d4ce51219360a047dadb985 100644

--- a/chrome/browser/extensions/extension_context_menu_model.cc

+++ b/chrome/browser/extensions/extension_context_menu_model.cc

@@ -13,7 +13,6 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/chrome_pages.h"

-#include "chrome/browser/ui/tab_contents/tab_contents.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_action.h"

#include "chrome/common/extensions/extension_constants.h"

@@ -74,11 +73,11 @@ bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const {

// homepage, we just disable this menu item.

return extension->GetHomepageURL().is_valid();

} else if (command_id == INSPECT_POPUP) {

- TabContents* tab_contents = chrome::GetActiveTabContents(browser_);

- if (!tab_contents)

+ WebContents* web_contents = chrome::GetActiveWebContents(browser_);

+ if (!web_contents)

return false;

- return extension_action_->HasPopup(SessionID::IdForTab(tab_contents));

+ return extension_action_->HasPopup(SessionID::IdForTab(web_contents));

} else if (command_id == DISABLE || command_id == UNINSTALL) {

// Some extension types can not be disabled or uninstalled.

return extensions::ExtensionSystem::Get(