diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 20:00:37 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 20:00:37 +0000 |
| commit | 22c830d776888b5c42110447ae7759f457482571 (patch) | |
| tree | 037e306bc5b8b5c6c700bcea95f0a13c642a1355 /chrome/browser/ui/browser.h | |
| parent | 36ce1d13b38bfc6e5a352595668ad9010574a001 (diff) | |
| download | chromium_src-22c830d776888b5c42110447ae7759f457482571.zip chromium_src-22c830d776888b5c42110447ae7759f457482571.tar.gz chromium_src-22c830d776888b5c42110447ae7759f457482571.tar.bz2 | |
Plumb STYEL_GENERIC thru BrowserShowHtmlDialog, ShowHtmlDialog, CreateViewsWindow.
Split from http://codereview.chromium.org/8461015/
STYEL_GENERIC is promoted from bubble_window_style in this CL:
http://codereview.chromium.org/8469006/
This CL plumbs the promoted STYLE_GENERIC thru the following functions:
BrowserShowHtmlDialog
ShowHtmlDialog
CreateViewsWindow
The purpose of this change is to enable us passing a STYLE_FLUSH_CONTENT&STYLE_XBAR
dialog style through BrowserShowHtmlDialog for certificate viewer html dialog.
See crbug.com/102511 and http://codereview.chromium.org/8461015/ for detail.
Ultimately we may be implementing the styles not related to window decorations in other
platforms for consistency.
BUG=102511
TEST=None
Review URL: http://codereview.chromium.org/8676014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser.h')
| -rw-r--r-- | chrome/browser/ui/browser.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index d0144ac..37456d3 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -34,6 +34,7 @@ #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/fullscreen_controller.h" #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" @@ -457,8 +458,14 @@ 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. + // |style| customizes this HTML dialog decoration and layout (X button, + // throbber, default content padding). Except ChromeOS, other platforms + // only have STYLE_GENERIC now. + // TODO(bshe): Implementing styles not related to window decoration in other + // platforms for consistency if necessary. gfx::NativeWindow BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, - gfx::NativeWindow parent_window); + gfx::NativeWindow parent_window, + DialogStyle style); // Called when a popup select is about to be displayed. void BrowserRenderWidgetShowing(); |