Initial Geolocation location bar icons.

chrome/browser/views/options/content_settings_window_view.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/views/options/content_settings_window_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/options/advanced_page_view.h"
 #include "chrome/browser/views/options/content_filter_page_view.h"
 #include "chrome/browser/views/options/cookie_filter_page_view.h"
 #include "chrome/browser/views/options/general_page_view.h"
+#include "chrome/browser/views/options/geolocation_filter_page_view.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/widget/root_view.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 
 static ContentSettingsWindowView* instance_ = NULL;
@@ skipping 134 matching lines @@
       new ContentFilterPageView(profile_, CONTENT_SETTINGS_TYPE_PLUGINS);
   tabs_->AddTabAtIndex(tab_index++,
                        l10n_util::GetString(IDS_PLUGIN_TAB_LABEL),
                        plugin_page, false);
 
   ContentFilterPageView* popup_page =
       new ContentFilterPageView(profile_, CONTENT_SETTINGS_TYPE_POPUPS);
   tabs_->AddTabAtIndex(tab_index++,
                        l10n_util::GetString(IDS_POPUP_TAB_LABEL),
                        popup_page, false);
-
-  DCHECK_EQ(tabs_->GetTabCount(), CONTENT_SETTINGS_NUM_TYPES);
+  int num_tabs = CONTENT_SETTINGS_NUM_TYPES - 1;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableGeolocation)) {
+    GeolocationFilterPageView* geolocation_page =
+        new GeolocationFilterPageView(profile_);
+    tabs_->AddTabAtIndex(tab_index++,
+                         l10n_util::GetString(IDS_GEOLOCATION_TAB_LABEL),
+                         geolocation_page, false);
+    ++num_tabs;
+  }
+  DCHECK_EQ(tabs_->GetTabCount(), num_tabs);
 }
 
 const OptionsPageView*
     ContentSettingsWindowView::GetCurrentContentSettingsTabView() const {
   return static_cast<OptionsPageView*>(tabs_->GetSelectedTab());
 }