| Index: chrome/browser/ui/browser_init.cc
|
| ===================================================================
|
| --- chrome/browser/ui/browser_init.cc (revision 116244)
|
| +++ chrome/browser/ui/browser_init.cc (working copy)
|
| @@ -78,10 +78,10 @@
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/installer/util/browser_distribution.h"
|
| #include "content/browser/child_process_security_policy.h"
|
| -#include "content/browser/tab_contents/tab_contents.h"
|
| #include "content/browser/tab_contents/tab_contents_view.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/navigation_details.h"
|
| +#include "content/public/browser/web_contents.h"
|
| #include "grit/chromium_strings.h"
|
| #include "grit/generated_resources.h"
|
| #include "grit/locale_settings.h"
|
| @@ -453,7 +453,7 @@
|
| uint32 behavior = 0;
|
| Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
|
| if (browser && browser->tab_count() == 1
|
| - && browser->GetTabContentsAt(0)->GetURL() ==
|
| + && browser->GetWebContentsAt(0)->GetURL() ==
|
| GURL(chrome::kChromeUINewTabURL)) {
|
| // There is only one tab and its the new tab page, make session restore
|
| // clobber it.
|
| @@ -1547,7 +1547,7 @@
|
| DCHECK(profile);
|
| if (process_startup) {
|
| if (command_line.HasSwitch(switches::kDisablePromptOnRepost))
|
| - NavigationController::DisablePromptOnRepost();
|
| + content::NavigationController::DisablePromptOnRepost();
|
|
|
| RegisterComponentsForUpdate(command_line);
|
|
|
|
|