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

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

Issue 8598015: Do not allow multiline input when naming bookmarks/folders on Mac (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: move newline change into BookmarkModel Created 9 years, 1 month 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" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.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/string_util.h"
Ilya Sherman 2011/11/21 21:36:10 nit: Please move this #include to the .cc file.
18 #include "base/synchronization/lock.h" 19 #include "base/synchronization/lock.h"
19 #include "base/synchronization/waitable_event.h" 20 #include "base/synchronization/waitable_event.h"
20 #include "chrome/browser/bookmarks/bookmark_service.h" 21 #include "chrome/browser/bookmarks/bookmark_service.h"
21 #include "chrome/browser/favicon/favicon_service.h" 22 #include "chrome/browser/favicon/favicon_service.h"
22 #include "chrome/browser/history/history.h" 23 #include "chrome/browser/history/history.h"
23 #include "content/browser/cancelable_request.h" 24 #include "content/browser/cancelable_request.h"
24 #include "content/public/browser/notification_registrar.h" 25 #include "content/public/browser/notification_registrar.h"
25 #include "googleurl/src/gurl.h" 26 #include "googleurl/src/gurl.h"
26 #include "third_party/skia/include/core/SkBitmap.h" 27 #include "third_party/skia/include/core/SkBitmap.h"
27 #include "ui/base/models/tree_node_model.h" 28 #include "ui/base/models/tree_node_model.h"
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 scoped_ptr<BookmarkIndex> index_; 477 scoped_ptr<BookmarkIndex> index_;
477 478
478 base::WaitableEvent loaded_signal_; 479 base::WaitableEvent loaded_signal_;
479 480
480 scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_; 481 scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
481 482
482 DISALLOW_COPY_AND_ASSIGN(BookmarkModel); 483 DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
483 }; 484 };
484 485
485 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_ 486 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/bookmarks/bookmark_model.cc » ('j') | chrome/browser/bookmarks/bookmark_model.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698