Don't link-depend on views/ in chrome/browser/gtk

This is a preparation for removing even more dependencies on views/
on Linux, but further parts are more complicated.

http://crbug.com/11066

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

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

4 files changed, 0 insertions, 33 deletions

diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index a1ded9e..be98e95 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -8,7 +8,6 @@
 
 #include "app/resource_bundle.h"
 #include "base/base_paths_linux.h"
-#include "base/command_line.h"
 #include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ -33,11 +32,9 @@
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/controls/button/text_button.h"
 #include "grit/theme_resources.h"
 
 namespace {
@@ -47,13 +44,6 @@ const int kLoadingAnimationFrameTimeMs = 30;
 
 const GdkColor kBorderColor = GDK_COLOR_RGB(0xbe, 0xc8, 0xd4);
 
-class DummyButtonListener : public views::ButtonListener {
- public:
-  virtual void ButtonPressed(views::Button* sender) {
-    DLOG(ERROR) << "Button Pressed!";
-  }
-};
-
 gboolean MainWindowConfigured(GtkWindow* window, GdkEventConfigure* event,
                               BrowserWindowGtk* browser_win) {
   gfx::Rect bounds = gfx::Rect(event->x, event->y, event->width, event->height);
@@ -286,20 +276,6 @@ BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
   g_signal_connect(G_OBJECT(content_vbox_), "expose-event",
                    G_CALLBACK(&OnContentAreaExpose), this);
 
-  // Temporary hack hidden behind a command line option to add one of the
-  // experimental ViewsGtk objects to the Gtk hierarchy.
-  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
-  if (parsed_command_line.HasSwitch(switches::kViewsGtk)) {
-    experimental_widget_.reset(new views::WidgetGtk());
-    experimental_widget_->Init(gfx::Rect(), false);
-    experimental_widget_->SetContentsView(
-        new views::TextButton(new DummyButtonListener, L"Button"));
-
-    gtk_box_pack_start(GTK_BOX(content_vbox_),
-                       experimental_widget_->GetNativeView(),
-                       false, false, 2);
-  }
-
   toolbar_.reset(new BrowserToolbarGtk(browser_.get()));
   toolbar_->Init(browser_->profile(), window_);
   toolbar_->AddToolbarToBox(content_vbox_);
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h
index 2763df86..2344ff0 100644
--- a/chrome/browser/gtk/browser_window_gtk.h
+++ b/chrome/browser/gtk/browser_window_gtk.h
@@ -14,7 +14,6 @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/views/widget/widget_gtk.h"
 
 class BookmarkBarGtk;
 class BrowserToolbarGtk;
@@ -191,9 +190,6 @@ class BrowserWindowGtk : public BrowserWindow,
   // cancel its pending tasks (which depend on us still existing).
   ScopedRunnableMethodFactory<BrowserWindowGtk> method_factory_;
 
-  // Experiment with using views for gtk.
-  scoped_ptr<views::WidgetGtk> experimental_widget_;
-
   // The timer used to update frames for the Loading Animation.
   base::RepeatingTimer<BrowserWindowGtk> loading_animation_timer_;
 
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index c2e1cbc..2b1227c 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -409,9 +409,6 @@ const wchar_t kWebWorkerProcessPerCore[]       = L"web-worker-process-per-core";
 // Note this is duplicated in webworkerclient_impl.cc
 const wchar_t kWebWorkerShareProcesses[]       = L"web-worker-share-processes";
 
-// Enables experimental views under gtk.
-const wchar_t kViewsGtk[]                      = L"views-gtk";
-
 // Enables the bookmark menu.
 const wchar_t kBookmarkMenu[]                  = L"bookmark-menu";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 87e86c0..bdd8e5b 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -157,8 +157,6 @@ extern const wchar_t kEnableWebWorkers[];
 extern const wchar_t kWebWorkerProcessPerCore[];
 extern const wchar_t kWebWorkerShareProcesses[];
 
-extern const wchar_t kViewsGtk[];
-
 extern const wchar_t kBookmarkMenu[];
 extern const wchar_t kEnableStatsTable[];