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

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller_private.mm

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/cocoa/cocoa_profile_test.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm
===================================================================
--- chrome/browser/ui/cocoa/browser_window_controller_private.mm (revision 145001)
+++ chrome/browser/ui/cocoa/browser_window_controller_private.mm (working copy)
@@ -14,6 +14,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_info_util.h"
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window_state.h"
#include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
#import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"
@@ -482,7 +483,7 @@
// If the relayout shifts the content area up or down, let the renderer know.
if (contentShifted) {
- if (WebContents* contents = browser_->GetActiveWebContents()) {
+ if (WebContents* contents = chrome::GetActiveWebContents(browser_.get())) {
if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView())
rwhv->WindowFrameChanged();
}
@@ -497,7 +498,7 @@
- (BOOL)shouldShowDetachedBookmarkBar {
DCHECK(browser_.get());
- TabContents* tab = browser_->GetActiveTabContents();
+ TabContents* tab = chrome::GetActiveTabContents(browser_.get());
return (tab && tab->bookmark_tab_helper()->ShouldShowBookmarkBar() &&
![previewableContentsController_ isShowingPreview]);
}
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/cocoa/cocoa_profile_test.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698