chrome/browser/ui/cocoa/web_dialog_window_controller.mm - Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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:

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 3181020f1f30685173b349708ce1a48ec2e0a80f..eee1c688a07f03acca0eca44d682c276df51cd24 100644

--- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm

+++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm

@@ -13,6 +13,7 @@

#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"

#include "content/public/browser/native_web_keyboard_event.h"

#include "content/public/browser/web_contents.h"

+#include "content/public/browser/web_contents_view.h"

#include "content/public/browser/web_ui_message_handler.h"

#include "ui/base/keycodes/keyboard_codes.h"

#include "ui/gfx/size.h"

@@ -342,7 +343,7 @@ void WebDialogWindowDelegateBridge::HandleKeyboardEvent(

- (void)loadDialogContents {

webContents_.reset(WebContents::Create(

WebContents::CreateParams(delegate_->browser_context())));

- [[self window] setContentView:webContents_->GetNativeView()];

+ [[self window] setContentView:webContents_->GetView()->GetNativeView()];

webContents_->SetDelegate(delegate_.get());

// This must be done before loading the page; see the comments in