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

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

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enhanced_bookmarks fix 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
OLDNEW
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/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
9 #import "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #import "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #import "chrome/browser/bookmarks/chrome_bookmark_client.h" 10 #import "chrome/browser/bookmarks/chrome_bookmark_client.h"
11 #import "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" 11 #import "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
12 #import "chrome/browser/profiles/profile.h" 12 #import "chrome/browser/profiles/profile.h"
13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" 13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"
16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h" 16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h"
17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h" 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"
18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" 19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" 20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
21 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 21 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
22 #include "components/bookmarks/browser/bookmark_model.h" 22 #include "components/bookmarks/browser/bookmark_model.h"
23 #include "components/bookmarks/browser/bookmark_node_data.h" 23 #include "components/bookmarks/browser/bookmark_node_data.h"
24 #include "ui/base/theme_provider.h" 24 #include "ui/base/theme_provider.h"
25 25
26 using bookmarks::BookmarkModel; 26 using bookmarks::BookmarkModel;
27 using bookmarks::BookmarkNode;
27 using bookmarks::BookmarkNodeData; 28 using bookmarks::BookmarkNodeData;
28 using bookmarks::kBookmarkBarMenuCornerRadius; 29 using bookmarks::kBookmarkBarMenuCornerRadius;
29 30
30 namespace { 31 namespace {
31 32
32 // Frequency of the scrolling timer in seconds. 33 // Frequency of the scrolling timer in seconds.
33 const NSTimeInterval kBookmarkBarFolderScrollInterval = 0.1; 34 const NSTimeInterval kBookmarkBarFolderScrollInterval = 0.1;
34 35
35 // Amount to scroll by per timer fire. We scroll rather slowly; to 36 // Amount to scroll by per timer fire. We scroll rather slowly; to
36 // accomodate we do several at a time. 37 // accomodate we do several at a time.
(...skipping 1975 matching lines...) Expand 10 before | Expand all | Expand 10 after
2012 2013
2013 - (void)setIgnoreAnimations:(BOOL)ignore { 2014 - (void)setIgnoreAnimations:(BOOL)ignore {
2014 ignoreAnimations_ = ignore; 2015 ignoreAnimations_ = ignore;
2015 } 2016 }
2016 2017
2017 - (BookmarkButton*)buttonThatMouseIsIn { 2018 - (BookmarkButton*)buttonThatMouseIsIn {
2018 return buttonThatMouseIsIn_; 2019 return buttonThatMouseIsIn_;
2019 } 2020 }
2020 2021
2021 @end // BookmarkBarFolderController 2022 @end // BookmarkBarFolderController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698