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

6 files changed, 18 insertions, 27 deletions

diff --git a/base/base.gypi b/base/base.gypi
index 9421717..fc7c811 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -362,7 +362,7 @@
       'conditions': [
         [ 'OS == "linux" or OS == "freebsd"', {
           'conditions': [
-            [ 'chromeos==1 or toolkit_views==1', {
+            [ 'chromeos==1', {
                 'sources/': [ ['include', '_chromeos\\.cc$'] ]
               },
             ],
diff --git a/build/common.gypi b/build/common.gypi
index c3181b3..45bcd48 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -318,7 +318,7 @@
       ['toolkit_views==1 or chromeos==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
-      ['chromeos==1 or toolkit_views==1', {
+      ['chromeos==1', {
         'defines': ['OS_CHROMEOS=1'],
       }],
       ['fastbuild!=0', {
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()),
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 6c3c247..61910b5 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -174,7 +174,7 @@
             '-E', '<(branded_env)',
           ],
           'conditions': [
-            ['chromeos==1 or toolkit_views==1', {
+            ['chromeos==1', {
               'action': ['-D', 'chromeos'],
             }],
             ['use_titlecase_in_grd_files==1', {
@@ -258,7 +258,7 @@
                     'build', '-o', '<(grit_out_dir)',
                     '-D', '<(chrome_build)'],
           'conditions': [
-            ['chromeos==1 or toolkit_views==1', {
+            ['chromeos==1', {
               'action': ['-D', 'chromeos'],
             }],
             ['use_titlecase_in_grd_files==1', {
@@ -315,7 +315,7 @@
             '-D', '<(chrome_build)'
           ],
           'conditions': [
-            ['chromeos==1 or toolkit_views==1', {
+            ['chromeos==1', {
               'action': ['-D', 'chromeos'],
             }],
             ['use_titlecase_in_grd_files==1', {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6f22a6c..940e5b4 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1884,7 +1884,7 @@
             'CHROME_V8',
           ],
         }],
-        ['chromeos==0 and toolkit_views==0', {
+        ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
           ],
@@ -2358,14 +2358,14 @@
                 ['exclude', '^browser/browser_list_gtk.cc'],
               ],
             }],
-#            ['OS=="linux" and toolkit_views==1', {
-#              'sources/': [
-#                ['include', '^browser/views/frame/standard_extender.h'],
-#                ['include', '^browser/views/frame/standard_extender.cc'],
-#                ['include', '^browser/gtk/external_protocol_dialog_gtk.cc'],
-#                ['include', '^browser/gtk/external_protocol_dialog_gtk.h'],
-#              ],
-#            }],
+            ['OS=="linux" and toolkit_views==1', {
+              'sources/': [
+                ['include', '^browser/views/frame/standard_extender.h'],
+                ['include', '^browser/views/frame/standard_extender.cc'],
+                ['include', '^browser/gtk/external_protocol_dialog_gtk.cc'],
+                ['include', '^browser/gtk/external_protocol_dialog_gtk.h'],
+              ],
+            }],
             ['OS=="linux" and chromeos==0 and toolkit_views==0', {
               'sources/': [
                 ['include', '^browser/printing/print_dialog_gtk.cc'],
@@ -2424,7 +2424,7 @@
                 ['include', 'browser/views/tabs/tab_overview_types.h'],
               ],
             }],
-            ['OS=="linux" and (chromeos==1 or toolkit_views==1)',{
+            ['OS=="linux" and chromeos==1',{
               'dependencies': [
 
                 '../third_party/protobuf2/protobuf.gyp:protobuf_lite',