Adds linux2 variable and change to WidgetGtk to make it compile.

BUG=none
TEST=none

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

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

3 files changed, 8 insertions, 1 deletions

diff --git a/build/common.gypi b/build/common.gypi
index ea68f11..856f2a1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -64,6 +64,8 @@
     # set the variable GYP_DEFINES to "toolkit_views=1", or modify
     # ~/.gyp/include.gypi .
     'toolkit_views%': 0,
+
+    'linux2%': 0,
   },
   'target_defaults': {
     'conditions': [
@@ -80,6 +82,9 @@
       ['toolkit_views==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
+      ['linux2==1', {
+        'defines': ['LINUX2=1'],
+      }],
       ['coverage!=0', {
         'conditions': [
           ['OS=="mac"', {
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 1aaddfa..e84ca15 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2242,7 +2242,7 @@
             },
           ],
         }],
-        ['OS=="linux" and toolkit_views==1', {
+        ['OS=="linux" and (toolkit_views==1 or linux2==1)', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index f79601e..ee380d3 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -77,7 +77,9 @@ void WidgetGtk::Init(GtkWidget* parent,
   // Force creation of the RootView if it hasn't been created yet.
   GetRootView();
 
+#if !defined(LINUX2)
   default_theme_provider_.reset(new DefaultThemeProvider());
+#endif
 
   // Make container here.
   CreateGtkWidget();