| Index: chrome/browser/ui/webui/sync_setup_handler2.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/sync_setup_handler2.cc (revision 116011)
|
| +++ chrome/browser/ui/webui/sync_setup_handler2.cc (working copy)
|
| @@ -26,7 +26,9 @@
|
| #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
|
| #include "chrome/common/net/gaia/gaia_constants.h"
|
| #include "chrome/common/url_constants.h"
|
| -#include "content/browser/tab_contents/tab_contents.h"
|
| +#include "content/browser/renderer_host/render_view_host.h"
|
| +#include "content/browser/renderer_host/render_view_host_delegate.h"
|
| +#include "content/public/browser/web_contents.h"
|
| #include "grit/chromium_strings.h"
|
| #include "grit/generated_resources.h"
|
| #include "grit/locale_settings.h"
|
| @@ -247,7 +249,7 @@
|
| // version of the Sync Promo.
|
| int message_body_resource_id = IDS_SYNC_PROMO_MESSAGE_BODY_A;
|
| if (web_ui && SyncPromoUI::GetIsLaunchPageForSyncPromoURL(
|
| - web_ui->tab_contents()->GetURL())) {
|
| + web_ui->web_contents()->GetURL())) {
|
| message_body_resource_id = sync_promo_trial::GetMessageBodyResID();
|
| }
|
| localized_strings->SetString(
|
| @@ -454,7 +456,7 @@
|
| }
|
|
|
| void SyncSetupHandler2::Focus() {
|
| - static_cast<RenderViewHostDelegate*>(web_ui()->tab_contents())->Activate();
|
| + web_ui()->web_contents()->GetRenderViewHost()->delegate()->Activate();
|
| }
|
|
|
| void SyncSetupHandler2::OnDidClosePage(const ListValue* args) {
|
|
|