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

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

Issue 9749003: Revert 127660 - WebUI TaskManager: Add method to set minimum window size on HTMLDialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | « no previous file | chrome/browser/ui/gtk/html_dialog_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/html_dialog_window_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/html_dialog_window_controller.mm (revision 127670)
+++ chrome/browser/ui/cocoa/html_dialog_window_controller.mm (working copy)
@@ -51,7 +51,6 @@
virtual void GetWebUIMessageHandlers(
std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE;
virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
- virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE;
virtual std::string GetDialogArgs() const OVERRIDE;
virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
virtual void OnCloseContents(WebContents* source,
@@ -180,20 +179,13 @@
}
void HtmlDialogWindowDelegateBridge::GetDialogSize(gfx::Size* size) const {
- if (delegate_)
+ if (delegate_) {
delegate_->GetDialogSize(size);
- else
+ } else {
*size = gfx::Size();
+ }
}
-void HtmlDialogWindowDelegateBridge::GetMinimumDialogSize(
- gfx::Size* size) const {
- if (delegate_)
- delegate_->GetMinimumDialogSize(size);
- else
- *size = gfx::Size();
-}
-
std::string HtmlDialogWindowDelegateBridge::GetDialogArgs() const {
return delegate_ ? delegate_->GetDialogArgs() : "";
}
Property changes on: chrome/browser/ui/cocoa/html_dialog_window_controller.mm
___________________________________________________________________
Deleted: svn:mergeinfo
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/html_dialog_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698