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

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

Issue 8135001: Fixed behavior of the bookmark bar visibility. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DCHECK_EQ instead of DCHECK Created 9 years, 2 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BOOKMARKS_BOOKMARK_MODEL_H_ 5 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_ 6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h"
14 #include "base/observer_list.h" 16 #include "base/observer_list.h"
15 #include "base/string16.h" 17 #include "base/string16.h"
16 #include "base/synchronization/lock.h" 18 #include "base/synchronization/lock.h"
17 #include "base/synchronization/waitable_event.h" 19 #include "base/synchronization/waitable_event.h"
18 #include "chrome/browser/bookmarks/bookmark_service.h" 20 #include "chrome/browser/bookmarks/bookmark_service.h"
19 #include "chrome/browser/favicon/favicon_service.h" 21 #include "chrome/browser/favicon/favicon_service.h"
20 #include "chrome/browser/history/history.h" 22 #include "chrome/browser/history/history.h"
21 #include "content/browser/cancelable_request.h" 23 #include "content/browser/cancelable_request.h"
22 #include "content/common/notification_registrar.h" 24 #include "content/common/notification_registrar.h"
23 #include "googleurl/src/gurl.h" 25 #include "googleurl/src/gurl.h"
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 scoped_ptr<BookmarkIndex> index_; 459 scoped_ptr<BookmarkIndex> index_;
458 460
459 base::WaitableEvent loaded_signal_; 461 base::WaitableEvent loaded_signal_;
460 462
461 scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_; 463 scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
462 464
463 DISALLOW_COPY_AND_ASSIGN(BookmarkModel); 465 DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
464 }; 466 };
465 467
466 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_ 468 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_context_menu_controller.cc ('k') | chrome/browser/bookmarks/bookmark_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698