UI polish for certificate viewer

chrome/browser/ui/browser.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 32 matching lines @@
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/page_zoom.h"
 #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;
 class Extension;
 class FindBarController;
 class InstantController;
 class InstantUnloadHandler;
 class PrefService;
 class Profile;
 class SessionStorageNamespace;
@@ skipping 381 matching lines @@
   void AddTabContents(TabContents* new_contents,
                       WindowOpenDisposition disposition,
                       const gfx::Rect& initial_pos,
                       bool user_gesture);
   void CloseTabContents(TabContents* contents);
 
   // Shows a dialog with HTML content and returns it. |delegate| contains a
   // 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 different function signature for
OS_CHROMEOS is not going to be accepted.

[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 to the style guide:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Default_Arguments

[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();
 
   // Notification that the bookmark bar has changed size.  We need to resize the
   // content area and notify our InfoBarContainer.
   void BookmarkBarSizeChanged(bool is_animating);
 
   // Replaces the state of the currently selected tab with the session
   // history restored from the SessionRestore system.
@@ skipping 990 matching lines @@
 
   MouseLockState mouse_lock_state_;
 
   // True if the browser window has been shown at least once.
   bool window_has_shown_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_