bookmarks: Move BookmarkNode into 'bookmarks' namespace.

chrome/browser/ui/bookmarks/bookmark_tab_helper.cc

 // 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.
 
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/sad_tab.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
 using bookmarks::BookmarkModel;
+using bookmarks::BookmarkNode;
 
 namespace {
 
 bool IsNTPWebUI(content::WebContents* web_contents) {
   content::WebUI* web_ui = NULL;
   // Use the committed entry so the bookmarks bar disappears at the same time
   // the page does.
   if (web_contents->GetController().GetLastCommittedEntry())
     web_ui = web_contents->GetCommittedWebUI();
   else
@@ skipping 47 matching lines @@
 }
 
 BookmarkTabHelper::BookmarkTabHelper(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       is_starred_(false),
       bookmark_model_(NULL),
       delegate_(NULL),
       bookmark_drag_(NULL) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  bookmark_model_= BookmarkModelFactory::GetForProfile(profile);
+  bookmark_model_ = BookmarkModelFactory::GetForProfile(profile);
   if (bookmark_model_)
     bookmark_model_->AddObserver(this);
 }
 
 void BookmarkTabHelper::UpdateStarredStateForCurrentURL() {
   const bool old_state = is_starred_;
   is_starred_ = (bookmark_model_ &&
       bookmark_model_->IsBookmarked(chrome::GetURLToBookmark(web_contents())));
 
   if (is_starred_ != old_state && delegate_)
@@ skipping 38 matching lines @@
     const content::LoadCommittedDetails& /*details*/,
     const content::FrameNavigateParams& /*params*/) {
   UpdateStarredStateForCurrentURL();
 }
 
 void BookmarkTabHelper::DidStartNavigationToPendingEntry(
     const GURL& /*url*/,
     content::NavigationController::ReloadType /*reload_type*/) {
   UpdateStarredStateForCurrentURL();
 }