Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1560)

Unified Diff: chrome/browser/ui/webui/sync_setup_handler.cc

Issue 10407122: Get rid of the last RenderViewHostDelegate usage in chrome. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
Index: chrome/browser/ui/webui/sync_setup_handler.cc
===================================================================
--- chrome/browser/ui/webui/sync_setup_handler.cc (revision 138434)
+++ chrome/browser/ui/webui/sync_setup_handler.cc (working copy)
@@ -31,13 +31,14 @@
#include "chrome/common/net/gaia/gaia_constants.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/render_view_host_delegate.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
#include "ui/base/l10n/l10n_util.h"
+using content::WebContents;
using l10n_util::GetStringFUTF16;
using l10n_util::GetStringUTF16;
@@ -957,7 +958,8 @@
void SyncSetupHandler::FocusUI() {
DCHECK(IsActiveLogin());
- web_ui()->GetWebContents()->GetRenderViewHost()->GetDelegate()->Activate();
+ WebContents* web_contents = web_ui()->GetWebContents();
+ web_contents->GetDelegate()->ActivateContents(web_contents);
}
void SyncSetupHandler::CloseUI() {
« no previous file with comments | « chrome/browser/ui/webui/print_preview/print_preview_handler.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698