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

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

Issue 1987203003: [Mac][Material Design] Add MD hover to bookmark items in menus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@uploaded__bookmark_title_baseline_fix
Patch Set: Created 4 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 | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/mac/sdk_forward_declarations.h" 10 #include "base/mac/sdk_forward_declarations.h"
11 #include "base/strings/sys_string_conversions.h" 11 #include "base/strings/sys_string_conversions.h"
12 #import "chrome/browser/bookmarks/bookmark_model_factory.h" 12 #import "chrome/browser/bookmarks/bookmark_model_factory.h"
13 #import "chrome/browser/bookmarks/managed_bookmark_service_factory.h" 13 #import "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
14 #import "chrome/browser/profiles/profile.h" 14 #import "chrome/browser/profiles/profile.h"
15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"
18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h" 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h"
19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h" 19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"
20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" 20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" 21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
22 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" 22 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
23 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 23 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
24 #include "components/bookmarks/browser/bookmark_model.h" 24 #include "components/bookmarks/browser/bookmark_model.h"
25 #include "components/bookmarks/browser/bookmark_node_data.h" 25 #include "components/bookmarks/browser/bookmark_node_data.h"
26 #import "components/bookmarks/managed/managed_bookmark_service.h" 26 #import "components/bookmarks/managed/managed_bookmark_service.h"
27 #include "grit/ui_resources.h" 27 #include "grit/ui_resources.h"
28 #include "ui/base/clipboard/clipboard_util_mac.h" 28 #include "ui/base/clipboard/clipboard_util_mac.h"
29 #include "ui/base/cocoa/cocoa_base_utils.h" 29 #include "ui/base/cocoa/cocoa_base_utils.h"
30 #include "ui/base/material_design/material_design_controller.h"
30 #include "ui/base/resource/resource_bundle.h" 31 #include "ui/base/resource/resource_bundle.h"
31 #include "ui/base/theme_provider.h" 32 #include "ui/base/theme_provider.h"
32 33
33 using bookmarks::BookmarkModel; 34 using bookmarks::BookmarkModel;
34 using bookmarks::BookmarkNode; 35 using bookmarks::BookmarkNode;
35 using bookmarks::BookmarkNodeData; 36 using bookmarks::BookmarkNodeData;
36 using bookmarks::kBookmarkBarMenuCornerRadius; 37 using bookmarks::kBookmarkBarMenuCornerRadius;
37 38
38 namespace { 39 namespace {
39 40
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 NSImage* image = child ? [barController_ faviconForNode:child 369 NSImage* image = child ? [barController_ faviconForNode:child
369 forADarkTheme:NO] 370 forADarkTheme:NO]
370 : nil; 371 : nil;
371 BookmarkContextMenuCocoaController* menuController = 372 BookmarkContextMenuCocoaController* menuController =
372 [barController_ menuController]; 373 [barController_ menuController];
373 BookmarkBarFolderButtonCell* cell = 374 BookmarkBarFolderButtonCell* cell =
374 [BookmarkBarFolderButtonCell buttonCellForNode:child 375 [BookmarkBarFolderButtonCell buttonCellForNode:child
375 text:nil 376 text:nil
376 image:image 377 image:image
377 menuController:menuController]; 378 menuController:menuController];
378 [cell setTag:kStandardButtonTypeWithLimitedClickFeedback]; 379 if (ui::MaterialDesignController::IsModeMaterial()) {
380 [cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
381 } else {
382 [cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
383 }
379 return cell; 384 return cell;
380 } 385 }
381 386
382 // Redirect to our logic shared with BookmarkBarController. 387 // Redirect to our logic shared with BookmarkBarController.
383 - (IBAction)openBookmarkFolderFromButton:(id)sender { 388 - (IBAction)openBookmarkFolderFromButton:(id)sender {
384 [folderTarget_ openBookmarkFolderFromButton:sender]; 389 [folderTarget_ openBookmarkFolderFromButton:sender];
385 } 390 }
386 391
387 // Create a bookmark button for the given node using frame. 392 // Create a bookmark button for the given node using frame.
388 // 393 //
(...skipping 1672 matching lines...) Expand 10 before | Expand all | Expand 10 after
2061 2066
2062 - (void)setIgnoreAnimations:(BOOL)ignore { 2067 - (void)setIgnoreAnimations:(BOOL)ignore {
2063 ignoreAnimations_ = ignore; 2068 ignoreAnimations_ = ignore;
2064 } 2069 }
2065 2070
2066 - (BookmarkButton*)buttonThatMouseIsIn { 2071 - (BookmarkButton*)buttonThatMouseIsIn {
2067 return buttonThatMouseIsIn_; 2072 return buttonThatMouseIsIn_;
2068 } 2073 }
2069 2074
2070 @end // BookmarkBarFolderController 2075 @end // BookmarkBarFolderController
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698