Chromium Code Reviews| Index: chrome/browser/ui/webui/task_manager_dialog.cc |
| diff --git a/chrome/browser/ui/webui/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager_dialog.cc |
| index 6c8b274f0d82972ade779b8a8e3b31481e4f6316..e41230275654a21c8db542ae0991f4b3b933d736 100644 |
| --- a/chrome/browser/ui/webui/task_manager_dialog.cc |
| +++ b/chrome/browser/ui/webui/task_manager_dialog.cc |
| @@ -29,6 +29,9 @@ |
| #include "ui/views/widget/widget.h" |
| #endif |
| +#define MINIMUM_TASKMANAGER_WIDTH 640 |
|
James Hawkins
2012/03/14 17:39:25
Use constants for values like this.
yoshiki
2012/03/15 08:35:07
Done.
|
| +#define MINIMUM_TASKMANAGER_HEIGHT 480 |
| + |
| using content::BrowserThread; |
| using content::WebContents; |
| using content::WebUIMessageHandler; |
| @@ -53,6 +56,9 @@ class TaskManagerDialogImpl : public HtmlDialogUIDelegate { |
| virtual string16 GetDialogTitle() const OVERRIDE { |
| return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_TITLE); |
| } |
| + virtual std::string GetDialogName() const OVERRIDE { |
| + return prefs::kTaskManagerWindowPlacement; |
| + } |
| virtual GURL GetDialogContentURL() const OVERRIDE { |
| std::string url_string(chrome::kChromeUITaskManagerURL); |
| url_string += "?"; |
| @@ -68,6 +74,7 @@ class TaskManagerDialogImpl : public HtmlDialogUIDelegate { |
| std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE { |
| } |
| virtual void GetDialogSize(gfx::Size* size) const OVERRIDE { |
| +#if !defined(TOOLKIT_VIEWS) |
| // If dialog's bounds are previously saved, use them. |
| if (g_browser_process->local_state()) { |
| const DictionaryValue* placement_pref = |
| @@ -83,7 +90,11 @@ class TaskManagerDialogImpl : public HtmlDialogUIDelegate { |
| } |
| // Otherwise set default size. |
| - size->SetSize(640, 480); |
| + size->SetSize(MINIMUM_TASKMANAGER_WIDTH, MINIMUM_TASKMANAGER_HEIGHT); |
| +#endif |
| + } |
| + virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE { |
| + size->SetSize(MINIMUM_TASKMANAGER_WIDTH, MINIMUM_TASKMANAGER_HEIGHT); |
| } |
| virtual std::string GetDialogArgs() const OVERRIDE { |
| return std::string(); |
| @@ -102,6 +113,7 @@ class TaskManagerDialogImpl : public HtmlDialogUIDelegate { |
| const content::ContextMenuParams& params) OVERRIDE { |
| return true; |
| } |
| +#if !defined(TOOLKIT_VIEWS) |
| virtual void StoreDialogSize(const gfx::Size& dialog_size) OVERRIDE { |
| // Store the dialog's bounds so that it can be restored with the same bounds |
| // the next time it's opened. |
| @@ -113,6 +125,7 @@ class TaskManagerDialogImpl : public HtmlDialogUIDelegate { |
| placement_pref->SetInteger("height", dialog_size.height()); |
| } |
| } |
| +#endif |
| private: |
| void ShowDialog(bool is_background_page_mode); |