chrome/browser/ui/views/simple_message_box_views.cc - Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"

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/views/simple_message_box_views.cc

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 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

« no previous file with comments | « chrome/browser/ui/views/select_file_dialog_extension.cc ('k') | chrome/browser/ui/views/ssl_client_certificate_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/simple_message_box_views.cc

diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc

index a4a7029af5f6d446e8353e1b657984dfe520cc1f..ae048bb2b5f7654ec3d4e0fc47af86d2e4fdb842 100644

--- a/chrome/browser/ui/views/simple_message_box_views.cc

+++ b/chrome/browser/ui/views/simple_message_box_views.cc

@@ -176,7 +176,7 @@ MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,

MessageBoxType type) {

scoped_refptr<SimpleMessageBoxViews> dialog(

new SimpleMessageBoxViews(title, message, type));

- CreateBrowserModalDialogViews(dialog, parent)->Show();

+ CreateBrowserModalDialogViews(dialog.get(), parent)->Show();

#if defined(USE_AURA)

// Use the widget's window itself so that the message loop

@@ -184,8 +184,8 @@ MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,

// |Cancel| or |Accept|.

aura::Window* anchor = parent ?

parent : dialog->GetWidget()->GetNativeWindow();

- aura::client::GetDispatcherClient(anchor->GetRootWindow())->

- RunWithDispatcher(dialog, anchor, true);

+ aura::client::GetDispatcherClient(anchor->GetRootWindow())

+ ->RunWithDispatcher(dialog.get(), anchor, true);

#else

{

base::MessageLoop::ScopedNestableTaskAllower allow(