chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm - Issue 10534093: TabContentsWrapper -> TabContents, part 37.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm

Issue 10534093: TabContentsWrapper -> TabContents, part 37. (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/extensions/extension_installed_bubble_bridge.mm ('k') | chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm

diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm

index 768545c1cf8cc9d7920661c7f163509d21534eaf..e34a359be3a7b76238c1bfe5ae320063c228b670 100644

--- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm

+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm

@@ -16,7 +16,7 @@

#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"

#include "chrome/browser/ui/find_bar/find_bar_controller.h"

#include "chrome/browser/ui/find_bar/find_tab_helper.h"

-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

+#include "chrome/browser/ui/tab_contents/tab_contents.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_view.h"

@@ -74,7 +74,7 @@ const float kRightEdgeOffset = 25;

}

- (void)dealloc {

- // All animations should be explicitly stopped by the TabContentsWrapper

+ // All animations should be explicitly stopped by the TabContents

// before a tab is closed.

DCHECK(!showHideAnimation_.get());

DCHECK(!moveAnimation_.get());

@@ -168,7 +168,7 @@ const float kRightEdgeOffset = 25;

if (!findBarBridge_)

return;

- TabContentsWrapper* tab_contents =

+ TabContents* tab_contents =

findBarBridge_->GetFindBarController()->tab_contents();

if (!tab_contents)

return;

@@ -222,7 +222,7 @@ const float kRightEdgeOffset = 25;

command == @selector(scrollToEndOfDocument:) ||

command == @selector(moveUp:) ||

command == @selector(moveDown:)) {

- TabContentsWrapper* contents =

+ TabContents* contents =

findBarBridge_->GetFindBarController()->tab_contents();

if (!contents)

return NO;

@@ -466,7 +466,7 @@ const float kRightEdgeOffset = 25;

if (!findBarBridge_ || !findBarBridge_->GetFindBarController())

return frame.origin.x;

- TabContentsWrapper* contents =

+ TabContents* contents =

findBarBridge_->GetFindBarController()->tab_contents();

if (!contents)

return frame.origin.x;

@@ -528,7 +528,7 @@ const float kRightEdgeOffset = 25;

// End the find session, hide the "x of y" text and disable the

// buttons, but do not close the find bar or raise the window here.

if (stopSearch && findBarBridge_) {

- TabContentsWrapper* contents =

+ TabContents* contents =

findBarBridge_->GetFindBarController()->tab_contents();

if (contents) {

FindTabHelper* find_tab_helper = contents->find_tab_helper();