chrome/browser/ui/cocoa/web_dialog_window_controller.mm - Issue 10831407: Kill PropertyBag, switch WebContents to SupportsUserData.

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 10831407: Kill PropertyBag, switch WebContents to SupportsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase only Created 8 years, 4 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 733154fedc3ec6081c4d87bd5317ee3e866012a0..805c29a2c9ccd28a849aed5e6016d512ee3cee9c 100644

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

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

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

#include "base/logging.h"

#include "base/memory/scoped_nsobject.h"

-#include "base/property_bag.h"

#include "base/sys_string_conversions.h"

#import "chrome/browser/ui/browser_dialogs.h"

#import "chrome/browser/ui/cocoa/browser_command_executor.h"

@@ -346,8 +345,7 @@ void WebDialogWindowDelegateBridge::HandleKeyboardEvent(

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

// WebDialogUI.

- WebDialogUI::GetPropertyAccessor().SetProperty(

- tabContents_->web_contents()->GetPropertyBag(), delegate_.get());

+ WebDialogUI::SetDelegate(tabContents_->web_contents(), delegate_.get());

tabContents_->web_contents()->GetController().LoadURL(

delegate_->GetDialogContentURL(),