Switch ConstrainedWindowTabHelper to use WebContentsUserData.
BUG=107201
TEST=no visible change
Review URL: https://chromiumcodereview.appspot.com/11024004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159811 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 7a8551b..f363566 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -156,9 +156,13 @@
}
bool HasConstrainedWindow(const Browser* browser) {
- TabContents* tab_contents = GetActiveTabContents(browser);
- return tab_contents && tab_contents->constrained_window_tab_helper()->
- constrained_window_count();
+ WebContents* web_contents = GetActiveWebContents(browser);
+ if (!web_contents)
+ return false;
+
+ ConstrainedWindowTabHelper* constrained_window_tab_helper =
+ ConstrainedWindowTabHelper::FromWebContents(web_contents);
+ return constrained_window_tab_helper->constrained_window_count() > 0;
}
bool PrintPreviewShowing(const Browser* browser) {
