Chromium Code Reviews| Index: chrome/browser/ui/browser.h |
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h |
| index fe2c1e14012b07c6a88fc31869cb1d2a497fe507..715036903c3e81366385937ccd82f60080166a32 100644 |
| --- a/chrome/browser/ui/browser.h |
| +++ b/chrome/browser/ui/browser.h |
| @@ -50,6 +50,10 @@ |
| #include "ui/base/ui_base_types.h" |
| #include "ui/gfx/rect.h" |
| +#if defined(OS_CHROMEOS) |
| +#include "chrome/browser/chromeos/frame/bubble_window_style.h" |
| +#endif |
| + |
| class BrowserSyncedWindowDelegate; |
| class BrowserTabRestoreServiceDelegate; |
| class BrowserWindow; |
| @@ -451,8 +455,15 @@ class Browser : public TabHandlerDelegate, |
| // pointer to the delegate who knows how to display the dialog (which file |
| // URL and JSON string input to use during initialization). |parent_window| |
| // is the window that should be parent of the dialog, or NULL for the default. |
| +#if defined(OS_CHROMEOS) |
| + gfx::NativeWindow BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, |
|
flackr
2011/11/10 16:03:16
Unfortunately I am fairly certain that having a di
bshe
2011/11/21 16:09:37
Done.
|
| + gfx::NativeWindow parent_window, |
| + chromeos::BubbleWindowStyle style = |
| + chromeos::STYLE_GENERIC); |
|
flackr
2011/11/10 16:03:16
Default argument values are not allowed according
bshe
2011/11/21 16:09:37
Done. Thanks for the link!
|
| +#else |
| gfx::NativeWindow BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, |
| gfx::NativeWindow parent_window); |
| +#endif |
| // Called when a popup select is about to be displayed. |
| void BrowserRenderWidgetShowing(); |