chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h - Issue 10540100: TabContentsWrapper -> TabContents, part 48.

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/views/ash/launcher/browser_launcher_item_controller.h

Issue 10540100: TabContentsWrapper -> TabContents, part 48. (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/views/ash/browser_non_client_frame_view_ash.cc ('k') | chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h

diff --git a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h

index 6d81eee145ba93b5758694b7fd858871dc2f7a14..3f1ae9ba5a9082ad92ecc26a30e9dc8b691af766 100644

--- a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h

+++ b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h

@@ -21,7 +21,6 @@ class Browser;

class ChromeLauncherController;

class LauncherFaviconLoader;

class TabContents;

-typedef TabContents TabContentsWrapper;

namespace ash {

class LauncherModel;

@@ -87,12 +86,12 @@ class BrowserLauncherItemController : public TabStripModelObserver,

void BrowserActivationStateChanged();

// TabStripModel overrides:

- virtual void ActiveTabChanged(TabContentsWrapper* old_contents,

- TabContentsWrapper* new_contents,

+ virtual void ActiveTabChanged(TabContents* old_contents,

+ TabContents* new_contents,

int index,

bool user_gesture) OVERRIDE;

virtual void TabChangedAt(

- TabContentsWrapper* tab,

+ TabContents* tab,

int index,

TabStripModelObserver::TabChangeType change_type) OVERRIDE;

@@ -119,7 +118,7 @@ class BrowserLauncherItemController : public TabStripModelObserver,

void UpdateItemStatus();

// Updates the launcher from |tab|.

- void UpdateLauncher(TabContentsWrapper* tab);

+ void UpdateLauncher(TabContents* tab);

ash::LauncherModel* launcher_model();