Crash fix + OS specific ss's enabled.

chrome/browser/dom_ui/bug_report_ui.h

Index: chrome/browser/dom_ui/bug_report_ui.h
diff --git a/chrome/browser/dom_ui/bug_report_ui.h b/chrome/browser/dom_ui/bug_report_ui.h
index 907dbb27f622085035ce002871c28b908125a779..b0f446b0745170b3aa64b6869d1cddb1eda185c3 100644
--- a/chrome/browser/dom_ui/bug_report_ui.h
+++ b/chrome/browser/dom_ui/bug_report_ui.h
@@ -6,8 +6,23 @@
 #define CHROME_BROWSER_DOM_UI_BUG_REPORT_UI_H_
 
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/views/window.h"
+#include "gfx/rect.h"

[oshima, 2010/12/02 18:03:30]

You should be able to forward declarations for Window/Browser/Rect types.

[rkc, 2010/12/02 19:54:04]

Done.

 
 class TabContents;
+class NSWindow;
+
+namespace browser {
+#if defined(TOOLKIT_VIEWS)
+void ShowHtmlBugReportView(views::Window* parent, Browser* browser);
+#elif defined(OS_LINUX)
+void ShowHtmlBugReportView(gfx::NativeWindow window, const gfx::Rect& bounds,
+                           Browser* browser);
+#elif defined(OS_MACOSX)
+void ShowHtmlBugReportView(NSWindow* window, Browser* browser);
+#endif

[oshima, 2010/12/02 18:03:30]

These are ugly. Ideally, screenshot code should be in BrowserWindow and this can
be like

ShowHtmlBugReportView(Browser* browser) {
  screenshort = browser->window()->TakeScreenShot();
}

This way, you can avoid using ifdefs.

I understand that this has to be this way in order to merge to M9, so please
file a bug and fix this for M10 once M9 is done.

Also, please remove macox.

[oshima, 2010/12/02 18:04:12]

forgot to mention. please add comment and include bugid.

On 2010/12/02 18:03:30, oshima wrote:

[rkc, 2010/12/02 19:54:04]

Done.

[rkc, 2010/12/02 19:54:04]

We can't remove MacOS since this file, even though not used, is still compiled
for a Mac; I am not sure why, but since this code will get refactored anyway,
this should not be a problem later.

(rest)
Done.

+} // namespace browser

[oshima, 2010/12/02 18:03:30]

two spaces before //

[rkc, 2010/12/02 19:54:04]

Done.

 
 class BugReportUI : public HtmlDialogUI {
  public: