Initial Geolocation location bar icons.

chrome/browser/gtk/options/content_settings_window_gtk.cc

 // Copyright (c) 2010 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/gtk/options/content_settings_window_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
+#include "base/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 namespace {
 
 // The singleton options window object.
@@ skipping 22 matching lines @@
   settings_window->ShowContentSettingsTab(page);
 }
 
 ContentSettingsWindowGtk::ContentSettingsWindowGtk(GtkWindow* parent,
                                                    Profile* profile)
     : profile_(profile),
       cookie_page_(profile),
       image_page_(profile, CONTENT_SETTINGS_TYPE_IMAGES),
       javascript_page_(profile, CONTENT_SETTINGS_TYPE_JAVASCRIPT),
       plugin_page_(profile, CONTENT_SETTINGS_TYPE_PLUGINS),
-      popup_page_(profile, CONTENT_SETTINGS_TYPE_POPUPS) {
+      popup_page_(profile, CONTENT_SETTINGS_TYPE_POPUPS),
+      geolocation_page_(profile) {
   // We don't need to observe changes in this value.
   last_selected_page_.Init(prefs::kContentSettingsWindowLastTabIndex,
                            profile->GetPrefs(), NULL);
 
   std::string dialog_name = l10n_util::GetStringUTF8(
       IDS_CONTENT_SETTINGS_TITLE);
   dialog_ = gtk_dialog_new_with_buttons(
       dialog_name.c_str(),
       parent,
       static_cast<GtkDialogFlags>(GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR),
@@ skipping 33 matching lines @@
       GTK_NOTEBOOK(notebook_),
       plugin_page_.get_page_widget(),
       gtk_label_new(
           l10n_util::GetStringUTF8(IDS_PLUGIN_TAB_LABEL).c_str()));
   gtk_notebook_append_page(
       GTK_NOTEBOOK(notebook_),
       popup_page_.get_page_widget(),
       gtk_label_new(
           l10n_util::GetStringUTF8(IDS_POPUP_TAB_LABEL).c_str()));
 
+  int num_pages = CONTENT_SETTINGS_NUM_TYPES - 1;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableGeolocation)) {
+    gtk_notebook_append_page(
+        GTK_NOTEBOOK(notebook_),
+        geolocation_page_.get_page_widget(),
+        gtk_label_new(
+            l10n_util::GetStringUTF8(IDS_GEOLOCATION_TAB_LABEL).c_str()));
+    ++num_pages;
+  }
+
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog_)->vbox), notebook_);
 
   DCHECK_EQ(gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook_)),
-            CONTENT_SETTINGS_NUM_TYPES);
+            num_pages);
 
   // Need to show the notebook before connecting switch-page signal, otherwise
   // we'll immediately get a signal switching to page 0 and overwrite our
   // last_selected_page_ value.
   gtk_widget_show_all(dialog_);
 
   g_signal_connect(notebook_, "switch-page", G_CALLBACK(OnSwitchPage), this);
 
   // We only have one button and don't do any special handling, so just hook it
   // directly to gtk_widget_destroy.
@@ skipping 42 matching lines @@
   window->last_selected_page_.SetValue(index);
 }
 
 // static
 void ContentSettingsWindowGtk::OnWindowDestroy(
     GtkWidget* widget,
     ContentSettingsWindowGtk* window) {
   settings_window = NULL;
   MessageLoop::current()->DeleteSoon(FROM_HERE, window);
 }