| Index: chrome/browser/ui/tabs/tab_strip_model_order_controller.cc
|
| diff --git a/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc b/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc
|
| index 8312f9c8dc6fe9d84e015d29759aea140d27b83a..7a474af3548395d83f6d1e6a581fd2506184e7c0 100644
|
| --- a/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc
|
| +++ b/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc
|
| @@ -4,7 +4,7 @@
|
|
|
| #include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h"
|
|
|
| -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| +#include "chrome/browser/ui/tab_contents/tab_contents.h"
|
| #include "content/public/browser/web_contents.h"
|
|
|
| using content::NavigationController;
|
| @@ -24,7 +24,7 @@ TabStripModelOrderController::~TabStripModelOrderController() {
|
| }
|
|
|
| int TabStripModelOrderController::DetermineInsertionIndex(
|
| - TabContentsWrapper* new_contents,
|
| + TabContents* new_contents,
|
| content::PageTransition transition,
|
| bool foreground) {
|
| int tab_count = tabstrip_->count();
|
| @@ -112,8 +112,8 @@ int TabStripModelOrderController::DetermineNewSelectedIndex(
|
| }
|
|
|
| void TabStripModelOrderController::ActiveTabChanged(
|
| - TabContentsWrapper* old_contents,
|
| - TabContentsWrapper* new_contents,
|
| + TabContents* old_contents,
|
| + TabContents* new_contents,
|
| int index,
|
| bool user_gesture) {
|
| NavigationController* old_opener = NULL;
|
|
|