Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/gtk/location_bar_view_gtk.h

 // Copyright (c) 2012 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_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/content_settings_types.h"
@@ skipping 25 matching lines @@
 class Image;
 }
 
 namespace ui {
 class AcceleratorGtk;
 }
 
 class LocationBarViewGtk : public OmniboxEditController,
                            public LocationBar,
                            public LocationBarTesting,
-                           public content::NotificationObserver {
+                           public content::NotificationObserver,
+                           public PrefObserver {
  public:
   explicit LocationBarViewGtk(Browser* browser);
   virtual ~LocationBarViewGtk();
 
   void Init(bool popup_window_mode);
 
   // Returns the widget the caller should host.  You must call Init() first.
   GtkWidget* widget() { return hbox_.get(); }
 
   // Returns the widget the page info bubble should point to.
@@ skipping 83 matching lines @@
   virtual ExtensionAction* GetVisiblePageAction(size_t index) OVERRIDE;
   virtual void TestPageActionPressed(size_t index) OVERRIDE;
   virtual void TestActionBoxMenuItemSelected(int command_id) OVERRIDE;
   virtual bool GetBookmarkStarVisibility() OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // PrefObserver:
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
+
   // Edit background color.
   static const GdkColor kBackgroundColor;
 
   // Superclass for content settings icons shown at the left side of the
   // location bar.
   class PageToolViewGtk : public ui::AnimationDelegate {
    public:
     explicit PageToolViewGtk(const LocationBarViewGtk* parent);
     virtual ~PageToolViewGtk();
 
@@ skipping 353 matching lines @@
   BooleanPrefMember edit_bookmarks_enabled_;
 
   // Used to remember the URL and title text when drag&drop has begun.
   GURL drag_url_;
   string16 drag_title_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_