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

Side by Side Diff: chrome/browser/ui/cocoa/download/download_shelf_controller.mm

Issue 686993002: MacViews: Rename files to avoid duplicate basename conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/download/download_shelf_controller.h" 5 #import "chrome/browser/ui/cocoa/download/download_shelf_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 #include "chrome/browser/download/download_stats.h" 10 #include "chrome/browser/download/download_stats.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/themes/theme_service.h" 12 #include "chrome/browser/themes/theme_service.h"
13 #include "chrome/browser/themes/theme_service_factory.h" 13 #include "chrome/browser/themes/theme_service_factory.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/chrome_pages.h" 15 #include "chrome/browser/ui/chrome_pages.h"
16 #import "chrome/browser/ui/cocoa/animatable_view.h" 16 #import "chrome/browser/ui/cocoa/animatable_view.h"
17 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" 17 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
18 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 18 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
19 #include "chrome/browser/ui/cocoa/download/download_item_controller.h" 19 #include "chrome/browser/ui/cocoa/download/download_item_controller.h"
20 #include "chrome/browser/ui/cocoa/download/download_shelf_mac.h" 20 #include "chrome/browser/ui/cocoa/download/download_shelf_mac.h"
21 #import "chrome/browser/ui/cocoa/download/download_shelf_view.h" 21 #import "chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.h"
22 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" 22 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
23 #include "content/public/browser/download_item.h" 23 #include "content/public/browser/download_item.h"
24 #include "content/public/browser/download_manager.h" 24 #include "content/public/browser/download_manager.h"
25 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h " 25 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h "
26 #import "ui/base/cocoa/hover_button.h" 26 #import "ui/base/cocoa/hover_button.h"
27 27
28 using content::DownloadItem; 28 using content::DownloadItem;
29 29
30 // Download shelf autoclose behavior: 30 // Download shelf autoclose behavior:
31 // 31 //
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 } 505 }
506 506
507 // Set the tracking off to create a new tracking area for the control. 507 // Set the tracking off to create a new tracking area for the control.
508 // When changing the bounds/frame on a HoverButton, the tracking isn't updated 508 // When changing the bounds/frame on a HoverButton, the tracking isn't updated
509 // correctly, it needs to be turned off and back on. 509 // correctly, it needs to be turned off and back on.
510 [hoverCloseButton_ setTrackingEnabled:NO]; 510 [hoverCloseButton_ setTrackingEnabled:NO];
511 [hoverCloseButton_ setFrame:bounds]; 511 [hoverCloseButton_ setFrame:bounds];
512 [hoverCloseButton_ setTrackingEnabled:YES]; 512 [hoverCloseButton_ setTrackingEnabled:YES];
513 } 513 }
514 @end 514 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698