chrome/browser/dom_ui/bug_report_ui.h - Issue 5514001: Crash fix + OS specific ss's enabled.

Side by Side Diff: chrome/browser/dom_ui/bug_report_ui.h

Issue 5514001: Crash fix + OS specific ss's enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Build fix for linux_view. Created 10 years 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_DOM_UI_BUG_REPORT_UI_H_	5 #ifndef CHROME_BROWSER_DOM_UI_BUG_REPORT_UI_H_

6 #define CHROME_BROWSER_DOM_UI_BUG_REPORT_UI_H_	6 #define CHROME_BROWSER_DOM_UI_BUG_REPORT_UI_H_

7	7

8 #include "chrome/browser/dom_ui/html_dialog_ui.h"	8 #include "chrome/browser/dom_ui/html_dialog_ui.h"

	9 #include "chrome/browser/ui/browser.h"

	10 #include "chrome/browser/ui/views/window.h"

	11 #include "gfx/rect.h"
	oshima 2010/12/02 18:03:30 You should be able to forward declarations for Win You should be able to forward declarations for Window/Browser/Rect types. rkc 2010/12/02 19:54:04 Done. Show quoted text On 2010/12/02 18:03:30, oshima wrote: > You should be able to forward declarations for Window/Browser/Rect types. Done.
9	12

10 class TabContents;	13 class TabContents;

	14 class NSWindow;

	15

	16 namespace browser {

	17 #if defined(TOOLKIT_VIEWS)

	18 void ShowHtmlBugReportView(views::Window* parent, Browser* browser);

	19 #elif defined(OS_LINUX)

	20 void ShowHtmlBugReportView(gfx::NativeWindow window, const gfx::Rect& bounds,

	21 Browser* browser);

	22 #elif defined(OS_MACOSX)

	23 void ShowHtmlBugReportView(NSWindow* window, Browser* browser);

	24 #endif
	oshima 2010/12/02 18:03:30 These are ugly. Ideally, screenshot code should be 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 forgot to mention. please add comment and include bugid. On 2010/12/02 18:03:30, oshima wrote: Show quoted text > 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. rkc 2010/12/02 19:54:04 Done. Show quoted text On 2010/12/02 18:03:30, oshima wrote: > 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. Done. rkc 2010/12/02 19:54:04 We can't remove MacOS since this file, even though Show quoted text On 2010/12/02 18:03:30, oshima wrote: > 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. 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.
	25 } // namespace browser
	oshima 2010/12/02 18:03:30 two spaces before // two spaces before // rkc 2010/12/02 19:54:04 Done. Show quoted text On 2010/12/02 18:03:30, oshima wrote: > two spaces before // Done.
11	26

12 class BugReportUI : public HtmlDialogUI {	27 class BugReportUI : public HtmlDialogUI {

13 public:	28 public:

14 explicit BugReportUI(TabContents* contents);	29 explicit BugReportUI(TabContents* contents);

15 private:	30 private:

16	31

17 DISALLOW_COPY_AND_ASSIGN(BugReportUI);	32 DISALLOW_COPY_AND_ASSIGN(BugReportUI);

18 };	33 };

19	34

20 #endif // CHROME_BROWSER_DOM_UI_BUG_REPORT_UI_H_	35 #endif // CHROME_BROWSER_DOM_UI_BUG_REPORT_UI_H_

OLD	NEW

« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/dom_ui/bug_report_ui.cc » ('j') | chrome/browser/dom_ui/bug_report_ui.cc » ('J')