chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm - Issue 284893003: Move bookmarks/core/... to bookmarks/...

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/profiles/profile.h"	10 #import "chrome/browser/profiles/profile.h"

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

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

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

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

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

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

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

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

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

20 #include "components/bookmarks/core/browser/bookmark_model.h"	20 #include "components/bookmarks/browser/bookmark_model.h"

21 #include "components/bookmarks/core/browser/bookmark_node_data.h"	21 #include "components/bookmarks/browser/bookmark_node_data.h"

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

23	23

24 using bookmarks::kBookmarkBarMenuCornerRadius;	24 using bookmarks::kBookmarkBarMenuCornerRadius;

25	25

26 namespace {	26 namespace {

27	27

28 // Frequency of the scrolling timer in seconds.	28 // Frequency of the scrolling timer in seconds.

29 const NSTimeInterval kBookmarkBarFolderScrollInterval = 0.1;	29 const NSTimeInterval kBookmarkBarFolderScrollInterval = 0.1;

30	30

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

(...skipping 1944 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1976	1976

1977 - (void)setIgnoreAnimations:(BOOL)ignore {	1977 - (void)setIgnoreAnimations:(BOOL)ignore {

1978 ignoreAnimations_ = ignore;	1978 ignoreAnimations_ = ignore;

1979 }	1979 }

1980	1980

1981 - (BookmarkButton*)buttonThatMouseIsIn {	1981 - (BookmarkButton*)buttonThatMouseIsIn {

1982 return buttonThatMouseIsIn_;	1982 return buttonThatMouseIsIn_;

1983 }	1983 }

1984	1984

1985 @end // BookmarkBarFolderController	1985 @end // BookmarkBarFolderController

OLD	NEW