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

Unified Diff: chrome/browser/ui/browser.cc

Issue 7880003: content: Move constrained window code from TabContents to TabContentsWrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac regression now that shutdown timing was changed for views. Created 9 years, 3 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/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 3bca4f8079c57a89d8c56f476551f4414fa2c424..4925e6ef43314b539ed1765a944d4bb8794de6d5 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -3507,15 +3507,6 @@ void Browser::ContentsZoomChange(bool zoom_in) {
ExecuteCommand(zoom_in ? IDC_ZOOM_PLUS : IDC_ZOOM_MINUS);
}
-void Browser::SetTabContentBlocked(TabContents* contents, bool blocked) {
- int index = tabstrip_model()->GetWrapperIndex(contents);
- if (index == TabStripModel::kNoTab) {
- NOTREACHED();
- return;
- }
- tabstrip_model()->SetTabBlocked(index, blocked);
-}
-
void Browser::TabContentsFocused(TabContents* tab_content) {
window_->TabContentsFocused(tab_content);
}
@@ -4157,6 +4148,15 @@ void Browser::SwapTabContents(TabContentsWrapper* old_tab_contents,
new_tab_contents);
}
+void Browser::SetTabContentBlocked(TabContentsWrapper* wrapper, bool blocked) {
+ int index = tabstrip_model()->GetIndexOfTabContents(wrapper);
+ if (index == TabStripModel::kNoTab) {
+ NOTREACHED();
+ return;
+ }
+ tabstrip_model()->SetTabBlocked(index, blocked);
+}
+
void Browser::SetSuggestedText(const string16& text,
InstantCompleteBehavior behavior) {
if (window()->GetLocationBar())

Powered by Google App Engine
This is Rietveld 408576698