Cleanup: remove unused internet and system pages for chrome os options.

These are now unused because of the migration to DOMUI options.  This is a continuation of cleanup done in http://codereview.chromium.org/6336005/

BUG=chromium-os:8307
TEST=ran on linux and netbook, unit tests passed

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

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

3 files changed, 3 insertions, 169 deletions

diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index 99be05a..5380a6a 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/common/renderer_preferences.h"
@@ -38,15 +39,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/x/x11_util.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/frame/browser_view.h"
-#include "chrome/browser/chromeos/native_dialog_window.h"
-#include "chrome/browser/chromeos/options/options_window_view.h"
-#include "views/window/window.h"
-#else
-#include "chrome/browser/ui/gtk/browser_window_gtk.h"
-#endif
-
 using WebKit::WebDragOperationsMask;
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationNone;
@@ -143,28 +135,6 @@ gboolean PaintNoBackground(GtkWidget* widget,
   return TRUE;
 }
 
-#if defined(OS_CHROMEOS)
-
-TabContents* GetBrowserWindowSelectedTabContents(BrowserWindow* window) {
-  chromeos::BrowserView* browser_view = static_cast<chromeos::BrowserView*>(
-      window);
-  return browser_view->GetSelectedTabContents();
-}
-
-GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) {
-  gfx::NativeView widget = gtk_window_get_focus(window->GetNativeHandle());
-
-  if (widget == NULL) {
-    chromeos::BrowserView* browser_view = static_cast<chromeos::BrowserView*>(
-        window);
-    widget = browser_view->saved_focused_widget();
-  }
-
-  return widget;
-}
-
-#else
-
 TabContents* GetBrowserWindowSelectedTabContents(BrowserWindow* window) {
   BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>(
       window);
@@ -175,8 +145,6 @@ GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) {
   return gtk_window_get_focus(window->GetNativeHandle());
 }
 
-#endif
-
 }  // namespace
 
 namespace event_utils {
@@ -1004,83 +972,6 @@ void GetTextColors(GdkColor* normal_base,
   g_object_unref(fake_entry);
 }
 
-#if defined(OS_CHROMEOS)
-
-GtkWindow* GetDialogTransientParent(GtkWindow* dialog) {
-  GtkWindow* parent = gtk_window_get_transient_for(dialog);
-  if (!parent)
-    parent = chromeos::GetOptionsViewParent();
-
-  return parent;
-}
-
-void ShowDialog(GtkWidget* dialog) {
-  // Make sure all controls are visible so that we get correct size.
-  gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
-
-  // Get dialog window size.
-  gint width = 0;
-  gint height = 0;
-  gtk_window_get_size(GTK_WINDOW(dialog), &width, &height);
-
-  chromeos::ShowNativeDialog(GetDialogTransientParent(GTK_WINDOW(dialog)),
-      dialog,
-      gtk_window_get_resizable(GTK_WINDOW(dialog)) ?
-          chromeos::DIALOG_FLAG_RESIZEABLE :
-          chromeos::DIALOG_FLAG_DEFAULT,
-      gfx::Size(width, height),
-      gfx::Size());
-}
-
-void ShowDialogWithLocalizedSize(GtkWidget* dialog,
-                                 int width_id,
-                                 int height_id,
-                                 bool resizeable) {
-  int width = (width_id == -1) ? 0 :
-      views::Window::GetLocalizedContentsWidth(width_id);
-  int height = (height_id == -1) ? 0 :
-      views::Window::GetLocalizedContentsHeight(height_id);
-
-  chromeos::ShowNativeDialog(GetDialogTransientParent(GTK_WINDOW(dialog)),
-      dialog,
-      resizeable ? chromeos::DIALOG_FLAG_RESIZEABLE :
-                   chromeos::DIALOG_FLAG_DEFAULT,
-      gfx::Size(width, height),
-      gfx::Size());
-}
-
-void ShowModalDialogWithMinLocalizedWidth(GtkWidget* dialog,
-                                          int width_id) {
-  int width = (width_id == -1) ? 0 :
-      views::Window::GetLocalizedContentsWidth(width_id);
-
-  chromeos::ShowNativeDialog(GetDialogTransientParent(GTK_WINDOW(dialog)),
-      dialog,
-      chromeos::DIALOG_FLAG_MODAL,
-      gfx::Size(),
-      gfx::Size(width, 0));
-}
-
-void PresentWindow(GtkWidget* window, int timestamp) {
-  GtkWindow* host_window = chromeos::GetNativeDialogWindow(window);
-  if (!host_window)
-      host_window = GTK_WINDOW(window);
-  if (timestamp)
-    gtk_window_present_with_time(host_window, timestamp);
-  else
-    gtk_window_present(host_window);
-}
-
-GtkWindow* GetDialogWindow(GtkWidget* dialog) {
-  return chromeos::GetNativeDialogWindow(dialog);
-}
-
-gfx::Rect GetDialogBounds(GtkWidget* dialog) {
-  return chromeos::GetNativeDialogContentsBounds(dialog);
-}
-
-#else
-
 void ShowDialog(GtkWidget* dialog) {
   gtk_widget_show_all(dialog);
 }
@@ -1129,8 +1020,6 @@ gfx::Rect GetDialogBounds(GtkWidget* dialog) {
   return gfx::Rect(x, y, width, height);
 }
 
-#endif
-
 string16 GetStockPreferencesMenuLabel() {
   GtkStockItem stock_item;
   string16 preferences;
diff --git a/chrome/browser/ui/gtk/options/content_page_gtk.cc b/chrome/browser/ui/gtk/options/content_page_gtk.cc
index c29f530..9ba3d5a 100644
--- a/chrome/browser/ui/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/ui/gtk/options/content_page_gtk.cc
@@ -31,10 +31,6 @@
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/options/options_window_view.h"
-#endif  // defined(OS_CHROMEOS)
-
 namespace {
 
 // Background color for the status label when it's showing an error.
@@ -70,10 +66,8 @@ ContentPageGtk::ContentPageGtk(Profile* profile)
     : OptionsPageBase(profile),
       sync_status_label_background_(NULL),
       sync_status_label_(NULL),
-#if !defined(OS_CHROMEOS)
       sync_action_link_background_(NULL),
       sync_action_link_(NULL),
-#endif
       sync_start_stop_button_(NULL),
       sync_customize_button_(NULL),
       privacy_dashboard_link_(NULL),
@@ -341,7 +335,6 @@ GtkWidget* ContentPageGtk::InitSyncGroup() {
   gtk_container_add(GTK_CONTAINER(sync_status_label_background_),
                     sync_status_label_);
 
-#if !defined(OS_CHROMEOS)
   // Sync action link.
   GtkWidget* link_hbox = gtk_hbox_new(FALSE, gtk_util::kLabelSpacing);
   sync_action_link_background_ = gtk_event_box_new();
@@ -354,7 +347,6 @@ GtkWidget* ContentPageGtk::InitSyncGroup() {
   gtk_container_add(GTK_CONTAINER(sync_action_link_background_),
                     sync_action_link_);
   gtk_widget_hide(sync_action_link_background_);
-#endif
 
   // Add the sync button into its own horizontal box so it does not
   // depend on the spacing above.
@@ -404,34 +396,22 @@ void ContentPageGtk::UpdateSyncControls() {
     l10n_util::GetStringUTF8(IDS_SYNC_CUSTOMIZE_BUTTON_LABEL);
 
   std::string start_stop_button_label;
-  bool is_start_stop_button_visible = false;
   bool is_start_stop_button_sensitive = false;
   if (sync_setup_completed) {
     start_stop_button_label =
         l10n_util::GetStringUTF8(IDS_SYNC_STOP_SYNCING_BUTTON_LABEL);
-#if defined(OS_CHROMEOS)
-    is_start_stop_button_visible = false;
-#else
-    is_start_stop_button_visible = true;
-#endif
     is_start_stop_button_sensitive = !managed;
   } else if (sync_service_->SetupInProgress()) {
     start_stop_button_label =
         l10n_util::GetStringUTF8(IDS_SYNC_NTP_SETUP_IN_PROGRESS);
-    is_start_stop_button_visible = true;
     is_start_stop_button_sensitive = false;
   } else {
     start_stop_button_label =
         l10n_util::GetStringUTF8(IDS_SYNC_START_SYNC_BUTTON_LABEL);
-    is_start_stop_button_visible = true;
     is_start_stop_button_sensitive = !managed;
   }
-  gtk_widget_set_no_show_all(sync_start_stop_button_,
-                             !is_start_stop_button_visible);
-  if (is_start_stop_button_visible)
-    gtk_widget_show(sync_start_stop_button_);
-  else
-    gtk_widget_hide(sync_start_stop_button_);
+  gtk_widget_set_no_show_all(sync_start_stop_button_, FALSE);
+  gtk_widget_show(sync_start_stop_button_);
   gtk_widget_set_sensitive(sync_start_stop_button_,
                            is_start_stop_button_sensitive);
   gtk_button_set_label(GTK_BUTTON(sync_start_stop_button_),
@@ -445,7 +425,6 @@ void ContentPageGtk::UpdateSyncControls() {
   gtk_button_set_label(GTK_BUTTON(sync_customize_button_),
                        customize_button_label.c_str());
   gtk_widget_set_sensitive(sync_customize_button_, !managed);
-#if !defined(OS_CHROMEOS)
   gtk_chrome_link_button_set_label(GTK_CHROME_LINK_BUTTON(sync_action_link_),
                                    UTF16ToUTF8(link_label).c_str());
   if (link_label.empty()) {
@@ -456,19 +435,14 @@ void ContentPageGtk::UpdateSyncControls() {
     gtk_widget_show(sync_action_link_background_);
   }
   gtk_widget_set_sensitive(sync_action_link_, !managed);
-#endif
   if (status_has_error) {
     gtk_widget_modify_bg(sync_status_label_background_, GTK_STATE_NORMAL,
                          &kSyncLabelErrorBgColor);
-#if !defined(OS_CHROMEOS)
     gtk_widget_modify_bg(sync_action_link_background_, GTK_STATE_NORMAL,
                          &kSyncLabelErrorBgColor);
-#endif
   } else {
     gtk_widget_modify_bg(sync_status_label_background_, GTK_STATE_NORMAL, NULL);
-#if !defined(OS_CHROMEOS)
     gtk_widget_modify_bg(sync_action_link_background_, GTK_STATE_NORMAL, NULL);
-#endif
   }
 }
 
@@ -497,12 +471,6 @@ void ContentPageGtk::OnResetDefaultThemeButtonClicked(GtkWidget* widget) {
 void ContentPageGtk::OnGetThemesButtonClicked(GtkWidget* widget) {
   UserMetricsRecordAction(UserMetricsAction("Options_ThemesGallery"),
                           profile()->GetPrefs());
-#if defined(OS_CHROMEOS)
-  // Close options dialog for ChromeOS becuase it is always stacked on top
-  // of browser window and blocks user's view.
-  chromeos::CloseOptionsWindow();
-#endif  // defined(OS_CHROMEOS)
-
   BrowserList::GetLastActive()->OpenThemeGalleryTabAndActivate();
 }
 
diff --git a/chrome/browser/ui/gtk/options/options_window_gtk.cc b/chrome/browser/ui/gtk/options/options_window_gtk.cc
index ecc8ab3..32fea06 100644
--- a/chrome/browser/ui/gtk/options/options_window_gtk.cc
+++ b/chrome/browser/ui/gtk/options/options_window_gtk.cc
@@ -25,11 +25,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/options/internet_page_view.h"
-#include "chrome/browser/chromeos/options/system_page_view.h"
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowGtk
 //
@@ -120,20 +115,6 @@ OptionsWindowGtk::OptionsWindowGtk(Profile* profile)
 
   notebook_ = gtk_notebook_new();
 
-#if defined(OS_CHROMEOS)
-  gtk_notebook_append_page(
-      GTK_NOTEBOOK(notebook_),
-      (new chromeos::SystemPageView(profile_))->WrapInGtkWidget(),
-      gtk_label_new(
-          l10n_util::GetStringUTF8(IDS_OPTIONS_SYSTEM_TAB_LABEL).c_str()));
-
-  gtk_notebook_append_page(
-      GTK_NOTEBOOK(notebook_),
-      (new chromeos::InternetPageView(profile_))->WrapInGtkWidget(),
-      gtk_label_new(
-          l10n_util::GetStringUTF8(IDS_OPTIONS_INTERNET_TAB_LABEL).c_str()));
-#endif
-
   gtk_notebook_append_page(
       GTK_NOTEBOOK(notebook_),
       general_page_.get_page_widget(),
@@ -240,9 +221,6 @@ void OptionsWindowGtk::OnWindowDestroy(GtkWidget* widget,
 ///////////////////////////////////////////////////////////////////////////////
 // Factory/finder method:
 
-#if !defined(OS_CHROMEOS)
-// ShowOptionsWindow for non ChromeOS build. For ChromeOS build, see
-// chrome/browser/chromeos/options/options_window_view.h
 void ShowOptionsWindow(OptionsPage page,
                        OptionsGroup highlight_group,
                        Profile* profile) {
@@ -264,4 +242,3 @@ void ShowOptionsWindow(OptionsPage page,
   }
   options_window->ShowOptionsPage(page, highlight_group);
 }
-#endif  // !defined(OS_CHROMEOS)