chrome/browser/extensions/extension_context_menu_model.cc - Issue 480883002: Move session_id.{cc,h} from chrome/browser/sessions to components/sessions

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 480883002: Move session_id.{cc,h} from chrome/browser/sessions to components/sessions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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/extensions/browser_extension_window_controller.cc ('k') | chrome/browser/extensions/extension_keybinding_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9c1e125b757aa89f4c9ecaeb578603e2d08fdc78..7230b9ed6345012af57ddde9560c031f74517df6 100644

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

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

@@ -16,6 +16,7 @@

#include "chrome/browser/extensions/extension_tab_util.h"

#include "chrome/browser/extensions/menu_manager.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/browser/sessions/session_tab_helper.h"

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

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

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

@@ -126,7 +127,7 @@ bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const {

return false;

return extension_action_ &&

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

+ extension_action_->HasPopup(SessionTabHelper::IdForTab(web_contents));

} else if (command_id == UNINSTALL) {

// Some extension types can not be uninstalled.

return extensions::ExtensionSystem::Get(