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

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

Issue 5977010: Move CancellationFlag and WaitableEvent to the synchronization subdirectory.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "build/build_config.h" 9 #include "build/build_config.h"
10 10
11 #include <set> 11 #include <set>
12 #include <vector> 12 #include <vector>
13 13
14 #include "app/tree_node_model.h" 14 #include "app/tree_node_model.h"
15 #include "base/lock.h" 15 #include "base/lock.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "base/string16.h" 17 #include "base/string16.h"
18 #include "base/waitable_event.h" 18 #include "base/synchronization/waitable_event.h"
19 #include "chrome/browser/bookmarks/bookmark_model_observer.h" 19 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
20 #include "chrome/browser/bookmarks/bookmark_service.h" 20 #include "chrome/browser/bookmarks/bookmark_service.h"
21 #include "chrome/browser/cancelable_request.h" 21 #include "chrome/browser/cancelable_request.h"
22 #include "chrome/browser/favicon_service.h" 22 #include "chrome/browser/favicon_service.h"
23 #include "chrome/browser/history/history.h" 23 #include "chrome/browser/history/history.h"
24 #include "chrome/browser/history/history_types.h" 24 #include "chrome/browser/history/history_types.h"
25 #include "chrome/common/notification_registrar.h" 25 #include "chrome/common/notification_registrar.h"
26 #include "googleurl/src/gurl.h" 26 #include "googleurl/src/gurl.h"
27 #include "third_party/skia/include/core/SkBitmap.h" 27 #include "third_party/skia/include/core/SkBitmap.h"
28 #include "testing/gtest/include/gtest/gtest_prod.h" 28 #include "testing/gtest/include/gtest/gtest_prod.h"
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 scoped_refptr<BookmarkStorage> store_; 464 scoped_refptr<BookmarkStorage> store_;
465 465
466 scoped_ptr<BookmarkIndex> index_; 466 scoped_ptr<BookmarkIndex> index_;
467 467
468 base::WaitableEvent loaded_signal_; 468 base::WaitableEvent loaded_signal_;
469 469
470 DISALLOW_COPY_AND_ASSIGN(BookmarkModel); 470 DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
471 }; 471 };
472 472
473 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_ 473 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698