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

chrome/browser/ui/gtk/options/content_page_gtk.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/options/content_page_gtk.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 13 matching lines @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "gfx/gtk_util.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #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.
 static const GdkColor kSyncLabelErrorBgColor = GDK_COLOR_RGB(0xff, 0x9a, 0x9a);
 
 // Helper for WrapLabelAtAllocationHack.
 void OnLabelAllocate(GtkWidget* label, GtkAllocation* allocation) {
   gtk_util::SetLabelWidth(label, allocation->width);
 
   // Disconnect ourselves.  Repeatedly resizing based on allocation causes
@@ skipping 15 matching lines @@
 
 }  // anonymous namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentPageGtk, public:
 
 ContentPageGtk::ContentPageGtk(Profile* profile)
     : OptionsPageBase(profile),
       sync_status_label_background_(NULL),
       sync_status_label_(NULL),
 #if !defined(OS_CHROMEOS)

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

I think you can remove the line, and the corresponding #endif. Please also check
OS_CHROMEOS in this file.

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

Done.

       sync_action_link_background_(NULL),
       sync_action_link_(NULL),
 #endif
       sync_start_stop_button_(NULL),
       sync_customize_button_(NULL),
       privacy_dashboard_link_(NULL),
       initializing_(true),
       sync_service_(NULL),
       managed_prefs_banner_(profile->GetPrefs(), OPTIONS_PAGE_CONTENT) {
   if (profile->GetProfileSyncService()) {
@@ skipping 406 matching lines @@
 
 void ContentPageGtk::OnResetDefaultThemeButtonClicked(GtkWidget* widget) {
   UserMetricsRecordAction(UserMetricsAction("Options_ThemesReset"),
                           profile()->GetPrefs());
   profile()->ClearTheme();
 }
 
 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();
 }
 
 void ContentPageGtk::OnSystemTitleBarRadioToggled(GtkWidget* widget) {
   DCHECK(browser_defaults::kCanToggleSystemTitleBar);
   if (initializing_)
     return;
 
   // We get two signals when selecting a radio button, one for the old radio
   // being toggled off and one for the new one being toggled on. Ignore the
@@ skipping 93 matching lines @@
   if (response == GTK_RESPONSE_ACCEPT) {
     sync_service_->DisableForUser();
     ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
   }
   gtk_widget_destroy(widget);
 }
 
 void ContentPageGtk::OnPrivacyDashboardLinkClicked(GtkWidget* widget) {
   BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate();
 }