Omnibox: Make URLs of Bookmarks Searchable - Try 2

components/bookmarks/browser/bookmark_model.h

 // Copyright 2014 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 COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 48 matching lines @@
 //
 // You should NOT directly create a BookmarkModel, instead go through the
 // BookmarkModelFactory.
 class BookmarkModel : public KeyedService {
  public:
   struct URLAndTitle {
     GURL url;
     base::string16 title;
   };
 
-  // |index_urls| says whether URLs should be stored in the BookmarkIndex
-  // in addition to bookmark titles.
-  BookmarkModel(bookmarks::BookmarkClient* client, bool index_urls);
+  explicit BookmarkModel(bookmarks::BookmarkClient* client);
   virtual ~BookmarkModel();
 
   // KeyedService:
   virtual void Shutdown() OVERRIDE;
 
   // Loads the bookmarks. This is called upon creation of the
   // BookmarkModel. You need not invoke this directly.
   // All load operations will be executed on |io_task_runner| and the completion
   // callback will be called from |ui_task_runner|.
   void Load(PrefService* pref_service,
@@ skipping 326 matching lines @@
   base::Lock url_lock_;
 
   // Used for loading favicons.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // Reads/writes bookmarks to disk.
   scoped_ptr<bookmarks::BookmarkStorage> store_;
 
   scoped_ptr<bookmarks::BookmarkIndex> index_;
 
-  // True if URLs are stored in the BookmarkIndex in addition to bookmark
-  // titles.
-  const bool index_urls_;
-
   base::WaitableEvent loaded_signal_;
 
   // See description of IsDoingExtensiveChanges above.
   int extensive_changes_;
 
   scoped_ptr<bookmarks::BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_