summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/browser_extension_window_controller.cc
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-05 22:01:43 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-05 22:01:43 +0000
commitb51f3562b28c3e685bd8a0241efd70d5215a11f1 (patch)
tree5dda218b975525ef5f0e550ed83ae66bf702a237 /chrome/browser/extensions/browser_extension_window_controller.cc
parent607f1367aa4d3dfa55713a8f1a772a574b1688f3 (diff)
downloadchromium_src-b51f3562b28c3e685bd8a0241efd70d5215a11f1.zip
chromium_src-b51f3562b28c3e685bd8a0241efd70d5215a11f1.tar.gz
chromium_src-b51f3562b28c3e685bd8a0241efd70d5215a11f1.tar.bz2
Remove Browser dependency in ExtensionFunctionDispatcher
Part 2/4 for chrome.tabs support for non browser windows. BUG=115532 TEST=All browser tests pass. Review URL: http://codereview.chromium.org/10021071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/browser_extension_window_controller.cc')
-rw-r--r--chrome/browser/extensions/browser_extension_window_controller.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/extensions/browser_extension_window_controller.cc b/chrome/browser/extensions/browser_extension_window_controller.cc
index e0d6a0b..ed647bd 100644
--- a/chrome/browser/extensions/browser_extension_window_controller.cc
+++ b/chrome/browser/extensions/browser_extension_window_controller.cc
@@ -48,12 +48,11 @@ BrowserExtensionWindowController::CreateWindowValueWithTabs() const {
return result;
}
-bool BrowserExtensionWindowController::CanClose(
- ExtensionWindowController::Reason* reason) const {
+bool BrowserExtensionWindowController::CanClose(Reason* reason) const {
// Don't let an extension remove the window if the user is dragging tabs
// in that window.
if (!browser_->IsTabStripEditable()) {
- *reason = ExtensionWindowController::REASON_TAB_STRIP_NOT_EDITABLE;
+ *reason = ExtensionWindowController::REASON_NOT_EDITABLE;
return false;
}
return true;
@@ -65,3 +64,7 @@ void BrowserExtensionWindowController::SetFullscreenMode(
if (browser_->window()->IsFullscreen() != is_fullscreen)
browser_->ToggleFullscreenModeWithExtension(extension_url);
}
+
+Browser* BrowserExtensionWindowController::GetBrowser() const {
+ return browser_;
+}