browser: Rename PageInfoModelObserver to Observer.

It's already a nested class of PageInfoModel class.

This avoids a redundancy when inheriting from it:

Instead of:
class Foo : public PageInfoModel::PageInfoModelObserver { ... };

Now:
class Foo : public PageInfoModel::Observer { ... };

This also renames ModelChanged from something less generic as
OnPageInfoModelChanged and add virtual and OVERRIDE annotations
where necessary.

BUG=None
TEST=None

R=rsesek@chromium.org

Review URL: http://codereview.chromium.org/7493048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94095 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 30 insertions, 27 deletions

diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc
index fe72383..8520074 100644
--- a/chrome/browser/page_info_model.cc
+++ b/chrome/browser/page_info_model.cc
@@ -19,8 +19,8 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/cert_status_flags.h"
-#include "net/base/ssl_connection_status_flags.h"
 #include "net/base/ssl_cipher_suite_names.h"
+#include "net/base/ssl_connection_status_flags.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -29,7 +29,7 @@ PageInfoModel::PageInfoModel(Profile* profile,
                              const GURL& url,
                              const NavigationEntry::SSLStatus& ssl,
                              bool show_history,
-                             PageInfoModelObserver* observer)
+                             Observer* observer)
     : observer_(observer) {
   Init();
 
@@ -339,7 +339,7 @@ void PageInfoModel::OnGotVisitCountToHost(HistoryService::Handle handle,
             base::TimeFormatShortDate(first_visit)),
         SECTION_INFO_FIRST_VISIT));
   }
-  observer_->ModelChanged();
+  observer_->OnPageInfoModelChanged();
 }
 
 PageInfoModel::PageInfoModel() : observer_(NULL) {
diff --git a/chrome/browser/page_info_model.h b/chrome/browser/page_info_model.h
index 6f19506..66ecf25 100644
--- a/chrome/browser/page_info_model.h
+++ b/chrome/browser/page_info_model.h
@@ -22,11 +22,11 @@ class Profile;
 // info dialog/bubble.
 class PageInfoModel {
  public:
-  class PageInfoModelObserver {
+  class Observer {
    public:
-    virtual ~PageInfoModelObserver() {}
+    virtual ~Observer() {}
 
-    virtual void ModelChanged() = 0;
+    virtual void OnPageInfoModelChanged() = 0;
   };
 
   enum SectionInfoType {
@@ -84,7 +84,7 @@ class PageInfoModel {
                 const GURL& url,
                 const NavigationEntry::SSLStatus& ssl,
                 bool show_history,
-                PageInfoModelObserver* observer);
+                Observer* observer);
   ~PageInfoModel();
 
   int GetSectionCount();
@@ -106,7 +106,7 @@ class PageInfoModel {
   // Shared initialization for default and testing constructor.
   void Init();
 
-  PageInfoModelObserver* observer_;
+  Observer* observer_;
 
   std::vector<SectionInfo> sections_;
 
diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller.h b/chrome/browser/ui/cocoa/page_info_bubble_controller.h
index d1ca865..05f4a47 100644
--- a/chrome/browser/ui/cocoa/page_info_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/page_info_bubble_controller.h
@@ -17,7 +17,7 @@
   scoped_ptr<PageInfoModel> model_;
 
   // Thin bridge that pushes model-changed notifications from C++ to Cocoa.
-  scoped_ptr<PageInfoModel::PageInfoModelObserver> bridge_;
+  scoped_ptr<PageInfoModel::Observer> bridge_;
 
   // The certificate ID for the page, 0 if the page is not over HTTPS.
   int certID_;
@@ -30,7 +30,7 @@
 // controller will release itself when the bubble is closed. |parentWindow|
 // cannot be nil.
 - (id)initWithPageInfoModel:(PageInfoModel*)model
-              modelObserver:(PageInfoModel::PageInfoModelObserver*)bridge
+              modelObserver:(PageInfoModel::Observer*)bridge
                parentWindow:(NSWindow*)parentWindow;
 
 // Shows the certificate display window. Note that this will implicitly close
diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm
index d87b7fc..fe0576e 100644
--- a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm
@@ -4,6 +4,7 @@
 
 #import "chrome/browser/ui/cocoa/page_info_bubble_controller.h"
 
+#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
@@ -93,15 +94,15 @@ const CGFloat kTextWidth = kWindowWidth - (kImageSize + kImageSpacing +
     kFramePadding * 2);
 
 // Bridge that listens for change notifications from the model.
-class PageInfoModelBubbleBridge : public PageInfoModel::PageInfoModelObserver {
+class PageInfoModelBubbleBridge : public PageInfoModel::Observer {
  public:
   PageInfoModelBubbleBridge()
       : controller_(nil),
         ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) {
   }
 
-  // PageInfoModelObserver implementation.
-  virtual void ModelChanged() {
+  // PageInfoModel::Observer implementation.
+  virtual void OnPageInfoModelChanged() OVERRIDE {
     // Check to see if a layout has already been scheduled.
     if (!task_factory_.empty())
       return;
@@ -167,7 +168,7 @@ void ShowPageInfoBubble(gfx::NativeWindow parent,
 @synthesize certID = certID_;
 
 - (id)initWithPageInfoModel:(PageInfoModel*)model
-              modelObserver:(PageInfoModel::PageInfoModelObserver*)bridge
+              modelObserver:(PageInfoModel::Observer*)bridge
                parentWindow:(NSWindow*)parentWindow {
   DCHECK(parentWindow);
 
diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm
index 52dfce5..2fb91d9 100644
--- a/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_nsobject.h"
-#include "base/string_util.h"
 #include "base/string_number_conversions.h"
+#include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/page_info_model.h"
-#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
-#import "chrome/browser/ui/cocoa/page_info_bubble_controller.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
+#import "chrome/browser/ui/cocoa/page_info_bubble_controller.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -30,9 +31,9 @@ class FakeModel : public PageInfoModel {
   }
 };
 
-class FakeBridge : public PageInfoModel::PageInfoModelObserver {
+class FakeBridge : public PageInfoModel::Observer {
  public:
-  void ModelChanged() {}
+  virtual void OnPageInfoModelChanged() OVERRIDE {}
 };
 
 class PageInfoBubbleControllerTest : public CocoaTest {
diff --git a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
index 187593b..bc9ed2b 100644
--- a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
@@ -30,7 +30,7 @@ class Profile;
 
 namespace {
 
-class PageInfoBubbleGtk : public PageInfoModel::PageInfoModelObserver,
+class PageInfoBubbleGtk : public PageInfoModel::Observer,
                           public BubbleDelegateGtk {
  public:
   PageInfoBubbleGtk(gfx::NativeWindow parent,
@@ -40,8 +40,8 @@ class PageInfoBubbleGtk : public PageInfoModel::PageInfoModelObserver,
                     bool show_history);
   virtual ~PageInfoBubbleGtk();
 
-  // PageInfoModel::PageInfoModelObserver implementation.
-  virtual void ModelChanged() OVERRIDE;
+  // PageInfoModel::Observer implementation.
+  virtual void OnPageInfoModelChanged() OVERRIDE;
 
   // BubbleDelegateGtk implementation.
   virtual void BubbleClosing(BubbleGtk* bubble, bool closed_by_escape) OVERRIDE;
@@ -123,7 +123,7 @@ PageInfoBubbleGtk::PageInfoBubbleGtk(gfx::NativeWindow parent,
 PageInfoBubbleGtk::~PageInfoBubbleGtk() {
 }
 
-void PageInfoBubbleGtk::ModelChanged() {
+void PageInfoBubbleGtk::OnPageInfoModelChanged() {
   InitContents();
 }
 
diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc
index 89ddddbf..807e82a 100644
--- a/chrome/browser/ui/views/page_info_bubble_view.cc
+++ b/chrome/browser/ui/views/page_info_bubble_view.cc
@@ -262,7 +262,7 @@ gfx::Size PageInfoBubbleView::GetPreferredSize() {
   return size;
 }
 
-void PageInfoBubbleView::ModelChanged() {
+void PageInfoBubbleView::OnPageInfoModelChanged() {
   // The start height must take into account that when we start animating,
   // a separator plus padding is immediately added before the view is animated
   // into existence.
diff --git a/chrome/browser/ui/views/page_info_bubble_view.h b/chrome/browser/ui/views/page_info_bubble_view.h
index a66e8b3..bb4e8e1 100644
--- a/chrome/browser/ui/views/page_info_bubble_view.h
+++ b/chrome/browser/ui/views/page_info_bubble_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_BUBBLE_VIEW_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/ui/views/bubble/bubble.h"
 #include "ui/base/animation/animation_delegate.h"
@@ -18,7 +19,7 @@ class Label;
 }
 
 class PageInfoBubbleView : public views::View,
-                           public PageInfoModel::PageInfoModelObserver,
+                           public PageInfoModel::Observer,
                            public BubbleDelegate,
                            public views::LinkListener,
                            public ui::AnimationDelegate {
@@ -38,8 +39,8 @@ class PageInfoBubbleView : public views::View,
   // View methods:
   virtual gfx::Size GetPreferredSize();
 
-  // PageInfoModel::PageInfoModelObserver methods:
-  virtual void ModelChanged();
+  // PageInfoModel::Observer methods:
+  virtual void OnPageInfoModelChanged() OVERRIDE;
 
   // BubbleDelegate methods:
   virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape);