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

Unified Diff: chrome/browser/chromeos/login/simple_web_view_dialog.cc

Issue 10532056: TabContentsWrapper -> TabContents, part 8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: small 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
Index: chrome/browser/chromeos/login/simple_web_view_dialog.cc
diff --git a/chrome/browser/chromeos/login/simple_web_view_dialog.cc b/chrome/browser/chromeos/login/simple_web_view_dialog.cc
index 8f6f35ef9656c18a73e25aa71418f72782e9f27d..9051b960381ab9f54ca8e93207c8ce4d5c98a794 100644
--- a/chrome/browser/chromeos/login/simple_web_view_dialog.cc
+++ b/chrome/browser/chromeos/login/simple_web_view_dialog.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/toolbar/toolbar_model.h"
#include "chrome/browser/ui/view_ids.h"
#include "chrome/browser/ui/views/location_bar/location_icon_view.h"
@@ -101,8 +101,7 @@ class StubBubbleModelDelegate : public ContentSettingBubbleModelDelegate {
virtual ~StubBubbleModelDelegate() {}
// ContentSettingBubbleModelDelegate implementation:
- virtual void ShowCollectedCookiesDialog(
- TabContentsWrapper* contents) OVERRIDE {
+ virtual void ShowCollectedCookiesDialog(TabContents* contents) OVERRIDE {
}
virtual void ShowContentSettingsPage(ContentSettingsType type) OVERRIDE {
@@ -151,7 +150,7 @@ void SimpleWebViewDialog::StartLoad(const GURL& url) {
MSG_ROUTING_NONE,
NULL,
NULL);
- wrapper_.reset(new TabContentsWrapper(web_contents));
+ tab_contents_.reset(new TabContents(web_contents));
web_view_->SetWebContents(web_contents);
web_contents->SetDelegate(this);
web_view_->LoadInitialURL(url);
« no previous file with comments | « chrome/browser/chromeos/login/simple_web_view_dialog.h ('k') | chrome/browser/chromeos/login/webui_login_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698