Change chromeos build to use views

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/508025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35186 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 55 insertions, 60 deletions

diff --git a/chrome/browser/views/dialog_stubs_gtk.cc b/chrome/browser/views/dialog_stubs_gtk.cc
index 27d7662..3795689 100644
--- a/chrome/browser/views/dialog_stubs_gtk.cc
+++ b/chrome/browser/views/dialog_stubs_gtk.cc
@@ -52,12 +52,6 @@ void ShowBookmarkManagerView(Profile* profile) {
   BookmarkManagerGtk::Show(profile);
 }
 
-#if not defined(OS_CHROMEOS)
-void ShowAboutChromeView(gfx::NativeWindow parent, Profile* profile) {
-  ShowAboutDialogForProfile(parent, profile);
-}
-#endif
-
 void ShowHtmlDialogView(gfx::NativeWindow parent, Browser* browser,
                         HtmlDialogUIDelegate* delegate) {
   // Hasn't been implemented yet on linux.
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5adec7d..a724c08 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1854,13 +1854,6 @@
             'CHROME_V8',
           ],
         }],
-        ['chromeos==1 and toolkit_views==0', {
-          'sources/': [
-            ['exclude', '^browser/chromeos/browser_extenders.cc'],
-            ['exclude', '^browser/gtk/external_protocol_dialog_gtk.cc'],
-            ['exclude', '^browser/gtk/external_protocol_dialog_gtk.h'],
-           ],
-        }],
         ['chromeos==0 and toolkit_views==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
@@ -1878,11 +1871,12 @@
             '../base/base.gyp:linux_versioninfo',
           ],
           'sources!': [
+             # Exclude extension shelf for toolstrips.
             'browser/views/extensions/extension_shelf.cc',
             'browser/views/extensions/extension_shelf.h',
             'browser/views/extensions/extension_view.cc',
             'browser/views/extensions/extension_view.h',
-                    # Windows-specific files.
+             # Windows-specific files.
             'browser/password_manager/password_store_win.cc',
             'browser/password_manager/password_store_win.h',
           ],
@@ -1917,13 +1911,6 @@
             }],
           ],
         }],
-        ['OS=="linux" and toolkit_views==0', {
-          'sources!': [
-            'browser/bookmarks/bookmark_drop_info.cc',
-            'browser/views/autocomplete/autocomplete_popup_gtk.cc',
-            'browser/views/autocomplete/autocomplete_popup_gtk.h'
-          ],
-        }],
         ['OS=="freebsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
@@ -2120,7 +2107,7 @@
             ['exclude', '^browser/views/'],
           ],
           'conditions': [
-            ['toolkit_views==1',{
+            ['OS=="linux" and (toolkit_views==1 or chromeos==1)',{
               'sources/': [
                 ['include', '^browser/dock_info_gtk.cc'],
                 ['include', '^browser/dock_info.cc'],
@@ -2332,42 +2319,27 @@
                 ['exclude', '^browser/browser_list_gtk.cc'],
               ],
             }],
-            ['OS=="linux" and toolkit_views==0', {
+#            ['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'],
                 ['include', '^browser/printing/print_dialog_gtk.h'],
+                ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
+                ['exclude', '^browser/views/autocomplete/autocomplete_popup_gtk.cc'],
+                ['exclude', '^browser/views/autocomplete/autocomplete_popup_gtk.h'],
               ],
             }],
-            ['chromeos==1 or toolkit_views==1',{
+            ['OS=="linux" and (chromeos==1 or toolkit_views==1)',{
               'dependencies': [
-                '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
-                '../third_party/protobuf2/protobuf.gyp:protoc#host',
-                '../third_party/chromeos_login_manager/chromeos_login_manager/chromeos_login_manager.gyp:session',
-                '../third_party/chromeos_login_manager/chromeos_login_manager/chromeos_login_manager.gyp:emit_login_prompt_ready',
-                'browser/chromeos/cros_api.gyp:cros_api',
                 '../views/views.gyp:views',
               ],
-              'actions': [
-                {
-                  'action_name': 'my_proto',
-                  'inputs': [
-                    '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-                    'browser/metrics/system_metrics.proto',
-                  ],
-                  'outputs': [
-                    '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.cc',
-                    '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.h',
-                  ],
-                  'dependencies': [
-                    '../third_party/protobuf2/protobuf.gyp:protoc',
-                  ],
-                  'action': [
-                    '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-                    'browser/metrics/system_metrics.proto',
-                    '--cpp_out=<(INTERMEDIATE_DIR)/chrome',
-                  ],
-                },
-              ],
               'include_dirs': [
                 '<(INTERMEDIATE_DIR)',
                 '<(INTERMEDIATE_DIR)/chrome',
@@ -2411,6 +2383,37 @@
                 ['include', 'browser/views/tabs/tab_overview_types.h'],
               ],
             }],
+            ['OS=="linux" and (chromeos==1 or toolkit_views==1)',{
+              'dependencies': [
+
+                '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
+                '../third_party/protobuf2/protobuf.gyp:protoc#host',
+                '../third_party/chromeos_login_manager/chromeos_login_manager/chromeos_login_manager.gyp:session',
+                '../third_party/chromeos_login_manager/chromeos_login_manager/chromeos_login_manager.gyp:emit_login_prompt_ready',
+                '../third_party/cros/cros_api.gyp:cros_api',
+              ],
+              'actions': [
+                {
+                  'action_name': 'my_proto',
+                  'inputs': [
+                    '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
+                    'browser/metrics/system_metrics.proto',
+                  ],
+                  'outputs': [
+                    '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.cc',
+                    '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.h',
+                  ],
+                  'dependencies': [
+                    '../third_party/protobuf2/protobuf.gyp:protoc',
+                  ],
+                  'action': [
+                    '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
+                    'browser/metrics/system_metrics.proto',
+                    '--cpp_out=<(INTERMEDIATE_DIR)/chrome',
+                  ],
+                },
+              ],
+            }],
           ],
           # Exclude files that should be excluded for all non-Windows platforms.
           'sources!': [
@@ -2431,7 +2434,7 @@
           ],
         }],
         # views depends on webkit headers.
-        ['OS=="win" or toolkit_views==1',{
+        ['OS=="win" or chromeos==1 or toolkit_views==1',{
           'dependencies': [
             '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
           ],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 2b65f43..e9e445a 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -336,7 +336,7 @@
             'browser/process_singleton_linux_uitest.cc',
           ],
         }],
-        ['OS=="linux" and toolkit_views==1', {
+        ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
@@ -856,7 +856,7 @@
         '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
       ],
       'conditions': [
-        ['chromeos==0 and toolkit_views==0', {
+        ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
           ],
@@ -1155,13 +1155,11 @@
           'dependencies': [
             '../views/views.gyp:views',
           ],
-        }],
-        ['OS=="linux" and toolkit_views==1', {
           'sources': [
             '<@(browser_tests_sources_views_specific)',
           ],
         }],
-        ['OS=="linux" and toolkit_views==0', {
+        ['OS=="linux" and toolkit_views==0 and chromeos==0', {
           'sources': [
             'browser/extensions/browser_action_test_util_gtk.cc',
             'browser/gtk/view_id_util_browsertest.cc',
@@ -1223,7 +1221,7 @@
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['OS=="linux" and toolkit_views==1', {
+        ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
@@ -1309,7 +1307,7 @@
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
+        ['OS=="win" or (OS=="linux" and (toolkit_views==1 or chromeos==1))', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
@@ -1548,7 +1546,7 @@
                 'browser/visitedlink_perftest.cc',
               ],
             }],
-            ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
+            ['OS=="win" or (OS=="linux" and (toolkit_views==1 or chromeos==1))', {
               'dependencies': [
                 '../views/views.gyp:views',
               ],
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi
index efa6be0..260035f 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.gypi
+++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi
@@ -69,7 +69,7 @@
         '<(DEPTH)/webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin',
       ],
     }],  # target_arch
-    ['OS=="linux" and toolkit_views==1', {
+    ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
       'dependencies': [
         '<(DEPTH)/views/views.gyp:views',
       ],