diff options
author | zelidrag@google.com <zelidrag@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 21:49:44 +0000 |
---|---|---|
committer | zelidrag@google.com <zelidrag@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 21:49:44 +0000 |
commit | fa1cf0b87092ed3f3069a8549270f999e05cca20 (patch) | |
tree | 71c08950f340004c1107776d0d4962d8b38bfb8e /chrome/browser/cocoa/tab_strip_controller.h | |
parent | 18db63ea67ad2f5e428022e32ff55de83c0db0ca (diff) | |
download | chromium_src-fa1cf0b87092ed3f3069a8549270f999e05cca20.zip chromium_src-fa1cf0b87092ed3f3069a8549270f999e05cca20.tar.gz chromium_src-fa1cf0b87092ed3f3069a8549270f999e05cca20.tar.bz2 |
Tab-modal dialog improvements:
- treat constrained dialogs as tab-modal - only one shows at the time
- added visual indication (tab pulsing) to the tab strip when a tab is blocked by a tab-modal dialog
- blocked all UI activity from rendrer host and forced refocusing on constrained (tab-modal) dialogs
This CL reverts http://codereview.chromium.org/384113 and instead incorporates the changes from http://codereview.chromium.org/392018.
BUG=456,27585,27620
TEST=Go to http://www/~thakis/cgi-bin/test.html, hit esc.
Review URL: http://codereview.chromium.org/541056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_strip_controller.h')
-rw-r--r-- | chrome/browser/cocoa/tab_strip_controller.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/chrome/browser/cocoa/tab_strip_controller.h b/chrome/browser/cocoa/tab_strip_controller.h index f5f8d9d..8bc3b00 100644 --- a/chrome/browser/cocoa/tab_strip_controller.h +++ b/chrome/browser/cocoa/tab_strip_controller.h @@ -7,9 +7,6 @@ #import <Cocoa/Cocoa.h> -#include <deque> -#include <map> - #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" #import "chrome/browser/cocoa/tab_controller_target.h" @@ -53,7 +50,7 @@ class ToolbarModel; scoped_ptr<TabStripModelObserverBridge> bridge_; Browser* browser_; // weak TabStripModel* tabStripModel_; // weak - + // Access to the TabContentsControllers (which own the parent view // for the toolbar and associated tab contents) given an index. Call // |indexFromModelIndex:| to convert a |tabStripModel_| index to a @@ -110,12 +107,6 @@ class ToolbarModel; // Is the mouse currently inside the strip; BOOL mouseInside_; - - // GTMWindowSheetController supports only one per-tab sheet at a time. - // Thus, keep a queue of sheets for every tab. The first element in the queue - // is the currently visible sheet, and when this sheet is closed, the next - // sheet in the queue will be shown. - std::map<NSView*, std::deque<ConstrainedWindowMac*> > constrainedWindows_; } // Initialize the controller with a view and browser that contains @@ -192,9 +183,9 @@ class ToolbarModel; // Returns the currently active TabContentsController. - (TabContentsController*)activeTabContentsController; -// See comments in browser_window_controller.h for documentation about these -// functions. -- (BOOL)attachConstrainedWindow:(ConstrainedWindowMac*)window; + // See comments in browser_window_controller.h for documentation about these + // functions. +- (void)attachConstrainedWindow:(ConstrainedWindowMac*)window; - (void)removeConstrainedWindow:(ConstrainedWindowMac*)window; - (void)updateDevToolsForContents:(TabContents*)contents; |