| Index: chrome/browser/ui/views/first_run_dialog.cc
|
| diff --git a/chrome/browser/ui/views/first_run_dialog.cc b/chrome/browser/ui/views/first_run_dialog.cc
|
| index 15a1169ce08a521e026d583117c8a6e41b20be83..977a3efec8a691fa3fe954bd5d0d4dd17b627cc5 100644
|
| --- a/chrome/browser/ui/views/first_run_dialog.cc
|
| +++ b/chrome/browser/ui/views/first_run_dialog.cc
|
| @@ -66,7 +66,7 @@ bool FirstRunDialog::Show(Profile* profile) {
|
| aura::Window* anchor = dialog->GetWidget()->GetNativeWindow();
|
| aura::client::DispatcherClient* client =
|
| aura::client::GetDispatcherClient(anchor->GetRootWindow());
|
| - client->RunWithDispatcher(NULL);
|
| + client->RunWithDispatcher(NULL, &quit_runloop_);
|
| dialog_shown = true;
|
| }
|
| #endif // defined(GOOGLE_CHROME_BUILD)
|
| @@ -103,10 +103,8 @@ FirstRunDialog::~FirstRunDialog() {
|
| }
|
|
|
| void FirstRunDialog::Done() {
|
| - aura::Window* window = GetWidget()->GetNativeView();
|
| - aura::client::DispatcherClient* client =
|
| - aura::client::GetDispatcherClient(window->GetRootWindow());
|
| - client->QuitNestedMessageLoop();
|
| + CHECK(!quit_runloop_.is_null());
|
| + quit_runloop_.Run();
|
| }
|
|
|
| views::View* FirstRunDialog::CreateExtraView() {
|
|
|