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

Unified Diff: chrome/browser/ui/cocoa/web_dialog_window_controller.mm

Issue 10534093: TabContentsWrapper -> TabContents, part 37. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/ui/cocoa/web_dialog_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
index 44d7f91809d26b4ec7777f2594a86e8193fd3a19..7b2fcf72a388b2ae79051c76b8e45b2309446884 100644
--- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
+++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
@@ -13,7 +13,7 @@
#import "chrome/browser/ui/browser_dialogs.h"
#import "chrome/browser/ui/cocoa/browser_command_executor.h"
#import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/webui/web_dialog_controller.h"
#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
#include "content/public/browser/native_web_keyboard_event.h"
@@ -351,18 +351,18 @@ void WebDialogWindowDelegateBridge::HandleKeyboardEvent(
}
- (void)loadDialogContents {
- contentsWrapper_.reset(new TabContentsWrapper(WebContents::Create(
+ tabContents_.reset(new TabContents(WebContents::Create(
delegate_->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL)));
[[self window]
- setContentView:contentsWrapper_->web_contents()->GetNativeView()];
- contentsWrapper_->web_contents()->SetDelegate(delegate_.get());
+ setContentView:tabContents_->web_contents()->GetNativeView()];
+ tabContents_->web_contents()->SetDelegate(delegate_.get());
// This must be done before loading the page; see the comments in
// WebDialogUI.
WebDialogUI::GetPropertyAccessor().SetProperty(
- contentsWrapper_->web_contents()->GetPropertyBag(), delegate_.get());
+ tabContents_->web_contents()->GetPropertyBag(), delegate_.get());
- contentsWrapper_->web_contents()->GetController().LoadURL(
+ tabContents_->web_contents()->GetController().LoadURL(
delegate_->GetDialogContentURL(),
content::Referrer(),
content::PAGE_TRANSITION_START_PAGE,
« no previous file with comments | « chrome/browser/ui/cocoa/web_dialog_window_controller.h ('k') | chrome/browser/ui/cocoa/web_intent_picker_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698