Fixed behavior of the bookmark bar visibility.

chrome/browser/ui/webui/options/browser_options_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
 #pragma once
 
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "ui/base/models/table_model_observer.h"
 
 class AutocompleteController;
 class CustomHomePagesTableModel;
 class TemplateURLService;
 
 // Chrome browser options page UI handler.
 class BrowserOptionsHandler : public OptionsPageUIHandler,
                               public AutocompleteControllerDelegate,
                               public ShellIntegration::DefaultWebClientObserver,
                               public TemplateURLServiceObserver,
                               public ui::TableModelObserver {
  public:
   BrowserOptionsHandler();
   virtual ~BrowserOptionsHandler();
 
   virtual void Initialize();
 
   // OptionsPageUIHandler implementation.
-  virtual void GetLocalizedValues(DictionaryValue* localized_strings);
-  virtual void RegisterMessages();
+  virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
+  virtual void RegisterMessages() OVERRIDE;
 
   // AutocompleteControllerDelegate implementation.
-  virtual void OnResultChanged(bool default_match_changed);
+  virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
 
   // ShellIntegration::DefaultWebClientObserver implementation.
   virtual void SetDefaultWebClientUIState(
-      ShellIntegration::DefaultWebClientUIState state);
+      ShellIntegration::DefaultWebClientUIState state) OVERRIDE;
 
   // TemplateURLServiceObserver implementation.
-  virtual void OnTemplateURLServiceChanged();
+  virtual void OnTemplateURLServiceChanged() OVERRIDE;
 
   // ui::TableModelObserver implementation.
-  virtual void OnModelChanged();
-  virtual void OnItemsChanged(int start, int length);
-  virtual void OnItemsAdded(int start, int length);
-  virtual void OnItemsRemoved(int start, int length);
+  virtual void OnModelChanged() OVERRIDE;
+  virtual void OnItemsChanged(int start, int length) OVERRIDE;
+  virtual void OnItemsAdded(int start, int length) OVERRIDE;
+  virtual void OnItemsRemoved(int start, int length) OVERRIDE;
 
  private:
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // Makes this the default browser. Called from WebUI.
   void BecomeDefaultBrowser(const ListValue* args);
 
   // Sets the search engine at the given index to be default. Called from WebUI.
   void SetDefaultSearchEngine(const ListValue* args);
 
   // Removes the startup page at the given indexes. Called from WebUI.
   void RemoveStartupPages(const ListValue* args);
 
   // Adds a startup page with the given URL after the given index.
   // Called from WebUI.
   void AddStartupPage(const ListValue* args);
 
   // Changes the startup page at the given index to the given URL.
   // Called from WebUI.
   void EditStartupPage(const ListValue* args);
 
   // Sets the startup page set to the current pages. Called from WebUI.
   void SetStartupPagesToCurrentPages(const ListValue* args);
 
   // Writes the current set of startup pages to prefs. Called from WebUI.
   void DragDropStartupPage(const ListValue* args);
 
   // Gets autocomplete suggestions asychronously for the given string.
   // Called from WebUI.
   void RequestAutocompleteSuggestions(const ListValue* args);
 
-  // Called when the 'Always show the bookmarks bar' checkbox is toggled.
-  // Notifies any listeners interested in this event.  |args| is ignored.
-  void ToggleShowBookmarksBar(const ListValue* args);
-
   // Enables/disables Instant.
   void EnableInstant(const ListValue* args);
   void DisableInstant(const ListValue* args);
 
   // Called to request information about the Instant field trial.
   void GetInstantFieldTrialStatus(const ListValue* args);
 
   // Returns the string ID for the given default browser state.
   int StatusStringIdForState(ShellIntegration::DefaultWebClientState state);
 
@@ skipping 29 matching lines @@
   // CustomHomePagesTableModel, consider changing it to something more like
   // TemplateURLService.
   scoped_ptr<CustomHomePagesTableModel> startup_custom_pages_table_model_;
 
   scoped_ptr<AutocompleteController> autocomplete_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_