Renames BoomarkBarModel to BookmarkModel.

chrome/browser/metrics_service.cc

 // Copyright (c) 2006-2008 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.
 
 
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
@@ skipping 144 matching lines @@
 //------------------------------------------------------------------------------
 
 #include <windows.h>
 
 #include "chrome/browser/metrics_service.h"
 
 #include "base/histogram.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/task.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/memory_details.h"
 #include "chrome/browser/plugin_process_info.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/template_url.h"
@@ skipping 269 matching lines @@
     case TEMPLATE_URL_MODEL_LOADED:
       LogKeywords(Source<TemplateURLModel>(source).ptr());
       break;
 
     case NOTIFY_OMNIBOX_OPENED_URL:
       current_log_->RecordOmniboxOpenedURL(
           *Details<AutocompleteLog>(details).ptr());
       break;
 
     case NOTIFY_BOOKMARK_MODEL_LOADED:
-      LogBookmarks(Source<Profile>(source)->GetBookmarkBarModel());
+      LogBookmarks(Source<Profile>(source)->GetBookmarkModel());
       break;
 
     default:
       NOTREACHED();
       break;
   }
   StartLogTransmissionTimer();
 }
 
 void MetricsService::RecordCleanShutdown() {
@@ skipping 828 matching lines @@
       stats.process_crashes++;
       break;
 
     default:
       NOTREACHED() << "Unexpected notification type " << type;
       return;
   }
 }
 
 // Recursively counts the number of bookmarks and folders in node.
-static void CountBookmarks(BookmarkBarNode* node,
-                           int* bookmarks,
-                           int* folders) {
+static void CountBookmarks(BookmarkNode* node, int* bookmarks, int* folders) {
   if (node->GetType() == history::StarredEntry::URL)
     (*bookmarks)++;
   else
     (*folders)++;
   for (int i = 0; i < node->GetChildCount(); ++i)
     CountBookmarks(node->GetChild(i), bookmarks, folders);
 }
 
-void MetricsService::LogBookmarks(BookmarkBarNode* node,
+void MetricsService::LogBookmarks(BookmarkNode* node,
                                   const wchar_t* num_bookmarks_key,
                                   const wchar_t* num_folders_key) {
   DCHECK(node);
   int num_bookmarks = 0;
   int num_folders = 0;
   CountBookmarks(node, &num_bookmarks, &num_folders);
   num_folders--;  // Don't include the root folder in the count.
 
   PrefService* pref = g_browser_process->local_state();
   DCHECK(pref);
   pref->SetInteger(num_bookmarks_key, num_bookmarks);
   pref->SetInteger(num_folders_key, num_folders);
 }
 
-void MetricsService::LogBookmarks(BookmarkBarModel* model) {
+void MetricsService::LogBookmarks(BookmarkModel* model) {
   DCHECK(model);
   LogBookmarks(model->GetBookmarkBarNode(),
                prefs::kNumBookmarksOnBookmarkBar,
                prefs::kNumFoldersOnBookmarkBar);
   LogBookmarks(model->other_node(),
                prefs::kNumBookmarksInOtherBookmarkFolder,
                prefs::kNumFoldersInOtherBookmarkFolder);
   ScheduleNextStateSave();
 }
 
@@ skipping 166 matching lines @@
   prof_prefs->SetInteger(pref_key.c_str(), value);
 }
 
 static bool IsSingleThreaded() {
   static int thread_id = 0;
   if (!thread_id)
     thread_id = GetCurrentThreadId();
   return GetCurrentThreadId() == thread_id;
 }