diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-09 01:16:57 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-09 01:16:57 +0000 |
| commit | fdc5bed00bdcf59f90777142c44eecde407ef23e (patch) | |
| tree | 150f199e6f882943f68c3d3cfbee7ea34f195cda /chrome/browser | |
| parent | 7ffe3aae33df556c298680c8754b76578e93c9eb (diff) | |
| download | chromium_src-fdc5bed00bdcf59f90777142c44eecde407ef23e.zip chromium_src-fdc5bed00bdcf59f90777142c44eecde407ef23e.tar.gz chromium_src-fdc5bed00bdcf59f90777142c44eecde407ef23e.tar.bz2 | |
official build and buildbots are now chromeos=1
valgrind bots are up (they're still red tho).
I believe it's ready to check this in.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/487003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/bug_report_view.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/views/dialog_stubs_gtk.cc | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index 39f377f..0b2616a 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -30,7 +30,7 @@ #include "views/window/client_view.h" #include "views/window/window.h" -#if defined(OS_CHROMEOS) +#if defined(OS_LINUX) #include "chrome/common/x11_util.h" #else #include "app/win_util.h" @@ -98,7 +98,7 @@ void ShowBugReportView(views::Window* parent, // rendered--do not re-render, and include windowed plugins). std::vector<unsigned char> *screenshot_png = new std::vector<unsigned char>; -#if defined(OS_CHROMEOS) +#if defined(OS_LINUX) x11_util::GrabWindowSnapshot(parent->GetNativeWindow(), screenshot_png); #else win_util::GrabWindowSnapshot(parent->GetNativeWindow(), screenshot_png); @@ -167,7 +167,7 @@ void BugReportView::SetupControl() { description_label_ = new views::Label( l10n_util::GetString(IDS_BUGREPORT_DESCRIPTION_LABEL)); -#if defined(OS_CHROMEOS) +#if defined(OS_LINUX) // TODO(davemoore) Remove this when gtk textfields support multiline. description_text_ = new views::Textfield; #else diff --git a/chrome/browser/views/dialog_stubs_gtk.cc b/chrome/browser/views/dialog_stubs_gtk.cc index 2c22ae9..d9a0f0c 100644 --- a/chrome/browser/views/dialog_stubs_gtk.cc +++ b/chrome/browser/views/dialog_stubs_gtk.cc @@ -24,15 +24,6 @@ namespace browser { -#if !defined(OS_CHROMEOS) -void ShowBugReportView(views::Window* parent, - Profile* profile, - TabContents* tab) { - // Bug report view hasn't been implemented on gtk yet. - NOTIMPLEMENTED(); -} -#endif - void ShowClearBrowsingDataView(views::Widget* parent, Profile* profile) { ClearBrowsingDataDialogGtk::Show(GTK_WINDOW(parent->GetNativeView()), |