chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm - Issue 422673002: Move BookmarkNodeData into bookmarks namespace.

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

Issue 422673002: Move BookmarkNodeData into bookmarks namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_folder_controller.h"	5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"

6	6

7 #include "base/mac/bundle_locations.h"	7 #include "base/mac/bundle_locations.h"

8 #include "base/mac/mac_util.h"	8 #include "base/mac/mac_util.h"

9 #include "base/strings/sys_string_conversions.h"	9 #include "base/strings/sys_string_conversions.h"

10 #import "chrome/browser/bookmarks/bookmark_model_factory.h"	10 #import "chrome/browser/bookmarks/bookmark_model_factory.h"

11 #import "chrome/browser/bookmarks/chrome_bookmark_client.h"	11 #import "chrome/browser/bookmarks/chrome_bookmark_client.h"

12 #import "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"	12 #import "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"

13 #import "chrome/browser/profiles/profile.h"	13 #import "chrome/browser/profiles/profile.h"

14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"	14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"

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

16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"	16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"

17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h"	17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h"

18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"	18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"

19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"	19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"

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

21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"	21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"

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

23 #include "components/bookmarks/browser/bookmark_model.h"	23 #include "components/bookmarks/browser/bookmark_model.h"

24 #include "components/bookmarks/browser/bookmark_node_data.h"	24 #include "components/bookmarks/browser/bookmark_node_data.h"

25 #include "ui/base/theme_provider.h"	25 #include "ui/base/theme_provider.h"

26	26

	27 using bookmarks::BookmarkNodeData;

27 using bookmarks::kBookmarkBarMenuCornerRadius;	28 using bookmarks::kBookmarkBarMenuCornerRadius;

28	29

29 namespace {	30 namespace {

30	31

31 // Frequency of the scrolling timer in seconds.	32 // Frequency of the scrolling timer in seconds.

32 const NSTimeInterval kBookmarkBarFolderScrollInterval = 0.1;	33 const NSTimeInterval kBookmarkBarFolderScrollInterval = 0.1;

33	34

34 // Amount to scroll by per timer fire. We scroll rather slowly; to	35 // Amount to scroll by per timer fire. We scroll rather slowly; to

35 // accomodate we do several at a time.	36 // accomodate we do several at a time.

36 const CGFloat kBookmarkBarFolderScrollAmount =	37 const CGFloat kBookmarkBarFolderScrollAmount =

(...skipping 1954 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1991	1992

1992 - (void)setIgnoreAnimations:(BOOL)ignore {	1993 - (void)setIgnoreAnimations:(BOOL)ignore {

1993 ignoreAnimations_ = ignore;	1994 ignoreAnimations_ = ignore;

1994 }	1995 }

1995	1996

1996 - (BookmarkButton*)buttonThatMouseIsIn {	1997 - (BookmarkButton*)buttonThatMouseIsIn {

1997 return buttonThatMouseIsIn_;	1998 return buttonThatMouseIsIn_;

1998 }	1999 }

1999	2000

2000 @end // BookmarkBarFolderController	2001 @end // BookmarkBarFolderController

OLD	NEW