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

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

Issue 1936263002: [Mac] Replace menu_overflow_{up,down}.pdf with PNGs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 | « chrome/app/theme/menu_overflow_up.pdf ('k') | chrome/chrome_dll_bundle.gypi » ('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 "ui/base/clipboard/clipboard_util_mac.h" 28 #include "ui/base/clipboard/clipboard_util_mac.h"
28 #include "ui/base/cocoa/cocoa_base_utils.h" 29 #include "ui/base/cocoa/cocoa_base_utils.h"
30 #include "ui/base/resource/resource_bundle.h"
29 #include "ui/base/theme_provider.h" 31 #include "ui/base/theme_provider.h"
30 32
31 using bookmarks::BookmarkModel; 33 using bookmarks::BookmarkModel;
32 using bookmarks::BookmarkNode; 34 using bookmarks::BookmarkNode;
33 using bookmarks::BookmarkNodeData; 35 using bookmarks::BookmarkNodeData;
34 using bookmarks::kBookmarkBarMenuCornerRadius; 36 using bookmarks::kBookmarkBarMenuCornerRadius;
35 37
36 namespace { 38 namespace {
37 39
38 // Frequency of the scrolling timer in seconds. 40 // Frequency of the scrolling timer in seconds.
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 // Because all of our performSelector: calls use withDelay: which 312 // Because all of our performSelector: calls use withDelay: which
311 // retains us. 313 // retains us.
312 [super dealloc]; 314 [super dealloc];
313 } 315 }
314 316
315 - (void)awakeFromNib { 317 - (void)awakeFromNib {
316 NSRect windowFrame = [[self window] frame]; 318 NSRect windowFrame = [[self window] frame];
317 NSRect scrollViewFrame = [scrollView_ frame]; 319 NSRect scrollViewFrame = [scrollView_ frame];
318 padding_ = NSWidth(windowFrame) - NSWidth(scrollViewFrame); 320 padding_ = NSWidth(windowFrame) - NSWidth(scrollViewFrame);
319 verticalScrollArrowHeight_ = NSHeight([scrollUpArrowView_ frame]); 321 verticalScrollArrowHeight_ = NSHeight([scrollUpArrowView_ frame]);
322
323 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
324 NSImage* image = rb.GetNativeImageNamed(IDR_MENU_OVERFLOW_DOWN).ToNSImage();
325 [[scrollUpArrowView_.subviews objectAtIndex:0] setImage:image];
326
327 image = rb.GetNativeImageNamed(IDR_MENU_OVERFLOW_UP).ToNSImage();
328 [[scrollDownArrowView_.subviews objectAtIndex:0] setImage:image];
320 } 329 }
321 330
322 // Overriden from NSWindowController to call childFolderWillShow: before showing 331 // Overriden from NSWindowController to call childFolderWillShow: before showing
323 // the window. 332 // the window.
324 - (void)showWindow:(id)sender { 333 - (void)showWindow:(id)sender {
325 [barController_ childFolderWillShow:self]; 334 [barController_ childFolderWillShow:self];
326 [super showWindow:sender]; 335 [super showWindow:sender];
327 } 336 }
328 337
329 - (int)buttonCount { 338 - (int)buttonCount {
(...skipping 1718 matching lines...) Expand 10 before | Expand all | Expand 10 after
2048 2057
2049 - (void)setIgnoreAnimations:(BOOL)ignore { 2058 - (void)setIgnoreAnimations:(BOOL)ignore {
2050 ignoreAnimations_ = ignore; 2059 ignoreAnimations_ = ignore;
2051 } 2060 }
2052 2061
2053 - (BookmarkButton*)buttonThatMouseIsIn { 2062 - (BookmarkButton*)buttonThatMouseIsIn {
2054 return buttonThatMouseIsIn_; 2063 return buttonThatMouseIsIn_;
2055 } 2064 }
2056 2065
2057 @end // BookmarkBarFolderController 2066 @end // BookmarkBarFolderController
OLDNEW
« no previous file with comments | « chrome/app/theme/menu_overflow_up.pdf ('k') | chrome/chrome_dll_bundle.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698