Out of line cleanups for Mac.

chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h

 // 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.
 
 // C++ bridge class to send a selector to a Cocoa object when the
 // bookmark model changes.  Some Cocoa objects edit the bookmark model
 // and temporarily save a copy of the state (e.g. bookmark button
 // editor).  As a fail-safe, these objects want an easy cancel if the
 // model changes out from under them.  For example, if you have the
 // bookmark button editor sheet open, then edit the bookmark in the
@@ skipping 23 matching lines @@
   // IBOutlet.  The arg passed is nil.
   // Many notifications happen independently of node
   // (e.g. BeingDeleted), so |node| can be nil.
   //
   // |object| is NOT retained, since the expected use case is for
   // ||object| to own the BookmarkModelObserverForCocoa and we don't
   // want a retain cycle.
   BookmarkModelObserverForCocoa(const BookmarkNode* node,
                                 BookmarkModel* model,
                                 NSObject* object,
-                                SEL selector) {
-    DCHECK(model);
-    node_ = node;
-    model_ = model;
-    object_ = object;
-    selector_ = selector;
-    model_->AddObserver(this);
-  }
-  virtual ~BookmarkModelObserverForCocoa() {
-    model_->RemoveObserver(this);
-  }
+                                SEL selector);
+  virtual ~BookmarkModelObserverForCocoa();
 
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) {
-    Notify();
-  }
+  virtual void BookmarkModelBeingDeleted(BookmarkModel* model);
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
-                                 int new_index) {
-    // Editors often have a tree of parents, so movement of folders
-    // must cause a cancel.
-      Notify();
-  }
+                                 int new_index);
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
-                                   const BookmarkNode* node) {
-    // See comment in BookmarkNodeMoved.
-    Notify();
-  }
+                                   const BookmarkNode* node);
   virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) {
-    if ((node_ == node) || (!node_))
-      Notify();
-  }
-  virtual void BookmarkImportBeginning(BookmarkModel* model) {
-    // Be conservative.
-    Notify();
-  }
+                                   const BookmarkNode* node);
+  virtual void BookmarkImportBeginning(BookmarkModel* model);
 
   // Some notifications we don't care about, but by being pure virtual
   // in the base class we must implement them.
   virtual void Loaded(BookmarkModel* model) {
   }
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
                                  int index) {
   }
   virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node) {
   }
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
                                              const BookmarkNode* node) {
   }
 
   virtual void BookmarkImportEnding(BookmarkModel* model) {
   }
 
  private:
   const BookmarkNode* node_;  // Weak; owned by a BookmarkModel.
   BookmarkModel* model_;  // Weak; it is owned by a Profile.
   NSObject* object_; // Weak, like a delegate.
   SEL selector_;
 
-  void Notify() {
-    [object_ performSelector:selector_ withObject:nil];
-  }
+  void Notify();
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelObserverForCocoa);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_MODEL_OBSERVER_FOR_COCOA_H