chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm - Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace.

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: mac fixes Created 5 years, 10 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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm » ('j') | components/enhanced_bookmarks/bookmark_image_service.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"	5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"

6	6

7 #include "chrome/browser/profiles/profile.h"	7 #include "chrome/browser/profiles/profile.h"

8 #import "chrome/browser/themes/theme_properties.h"	8 #import "chrome/browser/themes/theme_properties.h"

9 #import "chrome/browser/themes/theme_service.h"	9 #import "chrome/browser/themes/theme_service.h"

10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"	10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"

11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"	11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"

12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controlle r.h"	12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controlle r.h"

13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"	13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"

14 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	14 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

15 #import "chrome/browser/ui/cocoa/themed_window.h"	15 #import "chrome/browser/ui/cocoa/themed_window.h"

16 #import "chrome/browser/ui/cocoa/view_id_util.h"	16 #import "chrome/browser/ui/cocoa/view_id_util.h"

17 #include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h"	17 #include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h"

18 #include "components/bookmarks/browser/bookmark_utils.h"	18 #include "components/bookmarks/browser/bookmark_utils.h"

19 #include "content/public/browser/user_metrics.h"	19 #include "content/public/browser/user_metrics.h"

20 #import "third_party/mozilla/NSPasteboard+Utils.h"	20 #import "third_party/mozilla/NSPasteboard+Utils.h"

21	21

22 using base::UserMetricsAction;	22 using base::UserMetricsAction;

23 using bookmarks::BookmarkModel;	23 using bookmarks::BookmarkModel;

	24 using bookmarks::BookmarkNode;

24	25

25 @interface BookmarkBarView (Private)	26 @interface BookmarkBarView (Private)

26 - (void)themeDidChangeNotification:(NSNotification*)aNotification;	27 - (void)themeDidChangeNotification:(NSNotification*)aNotification;

27 - (void)updateTheme:(ui::ThemeProvider*)themeProvider;	28 - (void)updateTheme:(ui::ThemeProvider*)themeProvider;

28 @end	29 @end

29	30

30 @implementation BookmarkBarView	31 @implementation BookmarkBarView

31	32

32 @synthesize dropIndicatorShown = dropIndicatorShown_;	33 @synthesize dropIndicatorShown = dropIndicatorShown_;

33 @synthesize dropIndicatorPosition = dropIndicatorPosition_;	34 @synthesize dropIndicatorPosition = dropIndicatorPosition_;

(...skipping 245 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
279	280

280 @end // @implementation BookmarkBarTextField	281 @end // @implementation BookmarkBarTextField

281	282

282 @implementation BookmarkBarItemContainer	283 @implementation BookmarkBarItemContainer

283	284

284 - (NSMenu*)menu {	285 - (NSMenu*)menu {

285 return [barView_ menu];	286 return [barView_ menu];

286 }	287 }

287	288

288 @end // @implementation BookmarkBarItemContainer	289 @end // @implementation BookmarkBarItemContainer

OLD	NEW