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

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

Issue 23731010: Move text_elider to gfx. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update3 Created 7 years, 3 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 | Annotate | Revision Log
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_item_controller.h" 5 #import "chrome/browser/ui/cocoa/download/download_item_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/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 11 matching lines...) Expand all
22 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" 22 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
23 #import "chrome/browser/ui/cocoa/themed_window.h" 23 #import "chrome/browser/ui/cocoa/themed_window.h"
24 #import "chrome/browser/ui/cocoa/ui_localizer.h" 24 #import "chrome/browser/ui/cocoa/ui_localizer.h"
25 #include "content/public/browser/download_item.h" 25 #include "content/public/browser/download_item.h"
26 #include "content/public/browser/page_navigator.h" 26 #include "content/public/browser/page_navigator.h"
27 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
28 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
29 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" 29 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
30 #include "ui/base/l10n/l10n_util_mac.h" 30 #include "ui/base/l10n/l10n_util_mac.h"
31 #include "ui/base/resource/resource_bundle.h" 31 #include "ui/base/resource/resource_bundle.h"
32 #include "ui/base/text/text_elider.h" 32 #include "ui/gfx/text_elider.h"
33 #include "ui/gfx/font.h" 33 #include "ui/gfx/font.h"
34 #include "ui/gfx/image/image.h" 34 #include "ui/gfx/image/image.h"
35 35
36 using content::DownloadItem; 36 using content::DownloadItem;
37 37
38 namespace { 38 namespace {
39 39
40 // NOTE: Mac currently doesn't use this like Windows does. Mac uses this to 40 // NOTE: Mac currently doesn't use this like Windows does. Mac uses this to
41 // control the min size on the dangerous download text. TVL sent a query off to 41 // control the min size on the dangerous download text. TVL sent a query off to
42 // UX to fully spec all the the behaviors of download items and truncations 42 // UX to fully spec all the the behaviors of download items and truncations
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 301
302 - (IBAction)discardDownload:(id)sender { 302 - (IBAction)discardDownload:(id)sender {
303 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", 303 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
304 base::Time::Now() - creationTime_); 304 base::Time::Now() - creationTime_);
305 DownloadItem* download = bridge_->download_model()->download(); 305 DownloadItem* download = bridge_->download_model()->download();
306 download->Remove(); 306 download->Remove();
307 // WARNING: we are deleted at this point. Don't access 'this'. 307 // WARNING: we are deleted at this point. Don't access 'this'.
308 } 308 }
309 309
310 @end 310 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/download/download_item_cell.mm ('k') | chrome/browser/ui/cocoa/external_protocol_dialog.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698