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

Unified Diff: chrome/browser/ui/browser.cc

Issue 8479042: UI polish for certificate viewer (Closed) Base URL: /usr/local/google/home/bshe/NoTouchChromium/../TouchChromium/src/@trunk
Patch Set: Add x button and remove padding and close button for certificate viewer. Created 9 years, 1 month 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
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index f83cafd5278bd0fc4f8b123fe5381cab125baaef..91e5a1e285d0ad8a7333c77065f4f87712eee5ef 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1201,10 +1201,11 @@ void Browser::CloseTabContents(TabContents* contents) {
CloseContents(contents);
}
+#if defined(OS_CHROMEOS)
gfx::NativeWindow Browser::BrowserShowHtmlDialog(
HtmlDialogUIDelegate* delegate,
- gfx::NativeWindow parent_window) {
-#if defined(OS_CHROMEOS)
+ gfx::NativeWindow parent_window,
+ chromeos::BubbleWindowStyle style) {
// For Chrome OS, first try to parent the dialog over the current browser --
// it's likely to be maximized onscreen. If it isn't tabbed (e.g. it's a
// panel), find a browser that is.
@@ -1214,11 +1215,19 @@ gfx::NativeWindow Browser::BrowserShowHtmlDialog(
if (tabbed_browser && tabbed_browser->window())
parent_window = tabbed_browser->window()->GetNativeHandle();
}
+#else
+gfx::NativeWindow Browser::BrowserShowHtmlDialog(
+ HtmlDialogUIDelegate* delegate,
+ gfx::NativeWindow parent_window) {
#endif // defined(OS_CHROMEOS)
if (!parent_window)
parent_window = window_->GetNativeHandle();
+#if defined(OS_CHROMEOS)
+ return browser::ShowHtmlDialog(parent_window, profile_, delegate, style);
+#else
return browser::ShowHtmlDialog(parent_window, profile_, delegate);
+#endif
}
void Browser::BrowserRenderWidgetShowing() {

Powered by Google App Engine
This is Rietveld 408576698