Chromium Code Reviews| Index: chrome/browser/ui/views/extensions/extension_dialog.cc |
| diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc |
| index c2bc0b60e090f673eb0bba3f50be5093f3826a99..fe4896fbbde3bb20d7cbc0501368b8dbfd172928 100644 |
| --- a/chrome/browser/ui/views/extensions/extension_dialog.cc |
| +++ b/chrome/browser/ui/views/extensions/extension_dialog.cc |
| @@ -4,6 +4,7 @@ |
| #include "chrome/browser/ui/views/extensions/extension_dialog.h" |
| +#include "base/utf_string_conversions.h" |
| #include "chrome/browser/extensions/extension_host.h" |
| #include "chrome/browser/extensions/extension_process_manager.h" |
| #include "chrome/browser/profiles/profile.h" |
| @@ -63,6 +64,7 @@ ExtensionDialog* ExtensionDialog::Show( |
| TabContents* tab_contents, |
| int width, |
| int height, |
| + std::string title, |
|
mazda
2011/11/09 04:49:43
const string16& title
yoshiki
2011/11/09 15:06:39
Done.
|
| ExtensionDialogObserver* observer) { |
| CHECK(browser); |
| ExtensionHost* host = CreateExtensionHost(url, browser); |
| @@ -71,6 +73,7 @@ ExtensionDialog* ExtensionDialog::Show( |
| host->set_associated_tab_contents(tab_contents); |
| ExtensionDialog* dialog = new ExtensionDialog(host, observer); |
| + dialog->set_title(title); |
| dialog->InitWindow(browser, width, height); |
| // Ensure the DOM JavaScript can respond immediately to keyboard shortcuts. |
| host->render_view_host()->view()->Focus(); |
| @@ -129,7 +132,11 @@ bool ExtensionDialog::IsModal() const { |
| } |
| bool ExtensionDialog::ShouldShowWindowTitle() const { |
| - return false; |
| + return (window_title_ == "") ? false : true; |
|
mazda
2011/11/09 04:49:43
return !window_title_.empty();
yoshiki
2011/11/09 15:06:39
Done.
|
| +} |
| + |
| +string16 ExtensionDialog::GetWindowTitle() const { |
| + return UTF8ToUTF16(window_title_); |
| } |
| void ExtensionDialog::DeleteDelegate() { |