Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1061)

Unified Diff: chrome/browser/tab_contents/tab_contents.h

Issue 159780: Add support for constrained windows on os x, based on Avi's GTMWindowSheetController. (Closed)
Patch Set: Merge with ToT Created 11 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
Index: chrome/browser/tab_contents/tab_contents.h
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index e8f7d14562a1d191d1e985109aba130d02213be2..575eb21d09d3529bc49932b8619f70b71c7ef3a1 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -337,7 +337,6 @@ class TabContents : public PageNavigator,
// Window management ---------------------------------------------------------
-#if defined(OS_WIN) || defined(OS_LINUX)
// Create a new window constrained to this TabContents' clip and visibility.
// The window is initialized by using the supplied delegate to obtain basic
// window characteristics, and the supplied view for the content. The window
@@ -345,7 +344,6 @@ class TabContents : public PageNavigator,
// within the contents.
ConstrainedWindow* CreateConstrainedDialog(
ConstrainedWindowDelegate* delegate);
-#endif
// Adds a new tab or window with the given already-created contents
void AddNewContents(TabContents* new_contents,
@@ -366,6 +364,16 @@ class TabContents : public PageNavigator,
// Returns the number of constrained windows in this tab. Used by tests.
size_t constrained_window_count() { return child_windows_.size(); }
+ typedef std::vector<ConstrainedWindow*> ConstrainedWindowList;
+
+ // Return an iterator for the first constrained window in this tab contents.
+ ConstrainedWindowList::iterator constrained_window_begin()
+ { return child_windows_.begin(); }
+
+ // Return an iterator for the last constrained window in this tab contents.
+ ConstrainedWindowList::iterator constrained_window_end()
+ { return child_windows_.end(); }
+
// Views and focus -----------------------------------------------------------
// TODO(brettw): Most of these should be removed and the caller should call
// the view directly.
@@ -660,7 +668,6 @@ class TabContents : public PageNavigator,
// up at the next animation step if the throbber is going.
void SetNotWaitingForResponse() { waiting_for_response_ = false; }
- typedef std::vector<ConstrainedWindow*> ConstrainedWindowList;
ConstrainedWindowList child_windows_;
// Expires InfoBars that need to be expired, according to the state carried

Powered by Google App Engine
This is Rietveld 408576698