Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Side by Side Diff: chrome/browser/bookmarks/bookmark_bar_model.h

Issue 1868: Moves bookmark related classes into bookmarks directory. There are no... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/bookmark_storage.cc ('k') | chrome/browser/bookmarks/bookmark_bar_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_BOOKMARK_BAR_MODEL_H_ 5 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_
6 #define CHROME_BROWSER_BOOKMARK_BAR_MODEL_H_ 6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_
7 7
8 #include "base/lock.h" 8 #include "base/lock.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "base/scoped_handle.h" 10 #include "base/scoped_handle.h"
11 #include "chrome/browser/bookmarks/bookmark_service.h" 11 #include "chrome/browser/bookmarks/bookmark_service.h"
12 #include "chrome/browser/bookmark_storage.h" 12 #include "chrome/browser/bookmarks/bookmark_storage.h"
13 #include "chrome/browser/cancelable_request.h" 13 #include "chrome/browser/cancelable_request.h"
14 #include "chrome/browser/history/history.h" 14 #include "chrome/browser/history/history.h"
15 #include "chrome/browser/history/history_types.h" 15 #include "chrome/browser/history/history_types.h"
16 #include "chrome/common/notification_service.h" 16 #include "chrome/common/notification_service.h"
17 #include "chrome/views/tree_node_model.h" 17 #include "chrome/views/tree_node_model.h"
18 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
19 #include "skia/include/SkBitmap.h" 19 #include "skia/include/SkBitmap.h"
20 20
21 class BookmarkBarModel; 21 class BookmarkBarModel;
22 class BookmarkCodec; 22 class BookmarkCodec;
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 scoped_refptr<BookmarkStorage> store_; 422 scoped_refptr<BookmarkStorage> store_;
423 423
424 // Have we installed a listener on the NotificationService for 424 // Have we installed a listener on the NotificationService for
425 // NOTIFY_HISTORY_LOADED? A listener is installed if the bookmarks file 425 // NOTIFY_HISTORY_LOADED? A listener is installed if the bookmarks file
426 // doesn't exist and the history service hasn't finished loading. 426 // doesn't exist and the history service hasn't finished loading.
427 bool waiting_for_history_load_; 427 bool waiting_for_history_load_;
428 428
429 // Handle to event signaled when loading is done. 429 // Handle to event signaled when loading is done.
430 ScopedHandle loaded_signal_; 430 ScopedHandle loaded_signal_;
431 431
432 DISALLOW_EVIL_CONSTRUCTORS(BookmarkBarModel); 432 DISALLOW_COPY_AND_ASSIGN(BookmarkBarModel);
433 }; 433 };
434 434
435 #endif // CHROME_BROWSER_BOOKMARK_BAR_MODEL_H_ 435 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_
436
OLDNEW
« no previous file with comments | « chrome/browser/bookmark_storage.cc ('k') | chrome/browser/bookmarks/bookmark_bar_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698