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

Side by Side Diff: chrome/browser/ui/views/extensions/extension_dialog.cc

Issue 8770028: cros: Defer file selection callback until the window closes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/extensions/extension_dialog.h" 5 #include "chrome/browser/ui/views/extensions/extension_dialog.h"
6 6
7 #include "chrome/browser/extensions/extension_host.h" 7 #include "chrome/browser/extensions/extension_host.h"
8 #include "chrome/browser/extensions/extension_process_manager.h" 8 #include "chrome/browser/extensions/extension_process_manager.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 bool ExtensionDialog::ShouldShowWindowTitle() const { 132 bool ExtensionDialog::ShouldShowWindowTitle() const {
133 return !window_title_.empty(); 133 return !window_title_.empty();
134 } 134 }
135 135
136 string16 ExtensionDialog::GetWindowTitle() const { 136 string16 ExtensionDialog::GetWindowTitle() const {
137 return window_title_; 137 return window_title_;
138 } 138 }
139 139
140 void ExtensionDialog::WindowClosing() { 140 void ExtensionDialog::WindowClosing() {
141 if (observer_) 141 if (observer_)
142 observer_->ExtensionDialogIsClosing(this); 142 observer_->ExtensionDialogClosing(this);
143 } 143 }
144 144
145 void ExtensionDialog::DeleteDelegate() { 145 void ExtensionDialog::DeleteDelegate() {
146 // The window has finished closing. Allow ourself to be deleted. 146 // The window has finished closing. Allow ourself to be deleted.
147 Release(); 147 Release();
148 } 148 }
149 149
150 views::Widget* ExtensionDialog::GetWidget() { 150 views::Widget* ExtensionDialog::GetWidget() {
151 return extension_host_->view()->GetWidget(); 151 return extension_host_->view()->GetWidget();
152 } 152 }
(...skipping 17 matching lines...) Expand all
170 // If we aren't the host of the popup, then disregard the notification. 170 // If we aren't the host of the popup, then disregard the notification.
171 if (content::Details<ExtensionHost>(host()) != details) 171 if (content::Details<ExtensionHost>(host()) != details)
172 return; 172 return;
173 Close(); 173 Close();
174 break; 174 break;
175 default: 175 default:
176 NOTREACHED() << L"Received unexpected notification"; 176 NOTREACHED() << L"Received unexpected notification";
177 break; 177 break;
178 } 178 }
179 } 179 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698