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

chrome/browser/ui/gtk/gtk_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/gtk_util.h"
 
 #include <cairo/cairo.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include <cstdarg>
 #include <map>
 
 #include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #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"

[satorux1, 2011/02/02 03:29:49]

Do we need to add this? Otherwise, please remove it.

[falken, 2011/02/02 04:59:34]

Yes, it's still needed.  I just moved it from the #else of the #ifdef that was
removed.

 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/common/renderer_preferences.h"
 #include "gfx/gtk_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #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;
 using WebKit::WebDragOperationCopy;
 using WebKit::WebDragOperationLink;
 using WebKit::WebDragOperationMove;
 
 namespace {
 
 const char kBoldLabelMarkup[] = "<span weight='bold'>%s</span>";
@@ skipping 76 matching lines @@
   for (GList* item = children; item; item = item->next) {
     gtk_container_propagate_expose(GTK_CONTAINER(widget),
                                    GTK_WIDGET(item->data),
                                    event);
   }
   g_list_free(children);
 
   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);
   return browser_window->browser()->GetSelectedTabContents();
 }
 
 GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) {
   return gtk_window_get_focus(window->GetNativeHandle());
 }
 
-#endif
-
 }  // namespace
 
 namespace event_utils {
 
 WindowOpenDisposition DispositionFromEventFlags(guint event_flags) {
   if ((event_flags & GDK_BUTTON2_MASK) || (event_flags & GDK_CONTROL_MASK)) {
     return (event_flags & GDK_SHIFT_MASK) ?
         NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
   }
 
@@ skipping 807 matching lines @@
     *selected_base = style->base[GTK_STATE_SELECTED];
   if (normal_text)
     *normal_text = style->text[GTK_STATE_NORMAL];
   if (selected_text)
     *selected_text = style->text[GTK_STATE_SELECTED];
 
   g_object_ref_sink(fake_entry);
   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);
 }
 
 void ShowDialogWithLocalizedSize(GtkWidget* dialog,
                                  int width_id,
                                  int height_id,
                                  bool resizeable) {
   gtk_widget_realize(dialog);
   SetWindowSizeFromResources(GTK_WINDOW(dialog),
@@ skipping 28 matching lines @@
 }
 
 gfx::Rect GetDialogBounds(GtkWidget* dialog) {
   gint x = 0, y = 0, width = 1, height = 1;
   gtk_window_get_position(GTK_WINDOW(dialog), &x, &y);
   gtk_window_get_size(GTK_WINDOW(dialog), &width, &height);
 
   return gfx::Rect(x, y, width, height);
 }
 
-#endif
-
 string16 GetStockPreferencesMenuLabel() {
   GtkStockItem stock_item;
   string16 preferences;
   if (gtk_stock_lookup(GTK_STOCK_PREFERENCES, &stock_item)) {
     const char16 kUnderscore[] = { '_', 0 };
     RemoveChars(UTF8ToUTF16(stock_item.label), kUnderscore, &preferences);
   }
   return preferences;
 }
 
@@ skipping 97 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util