chrome/browser/cocoa/download_item_controller.mm - Issue 2965015: Attempt four at landing the "histogram.h removed from message_loop.h" patch.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2965015: Attempt four at landing the "histogram.h removed from message_loop.h" patch. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: win build fixes Created 10 years, 5 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/browser/chromeos/boot_times_loader.cc ('k') | chrome/browser/cocoa/external_protocol_dialog.mm » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/cocoa/download_item_controller.h"	5 #import "chrome/browser/cocoa/download_item_controller.h"

6	6

7 #include "app/l10n_util_mac.h"	7 #include "app/l10n_util_mac.h"

8 #include "app/resource_bundle.h"	8 #include "app/resource_bundle.h"

9 #include "app/text_elider.h"	9 #include "app/text_elider.h"

	10 #include "base/histogram.h"

10 #include "base/mac_util.h"	11 #include "base/mac_util.h"

11 #include "base/sys_string_conversions.h"	12 #include "base/sys_string_conversions.h"

12 #include "base/utf_string_conversions.h"	13 #include "base/utf_string_conversions.h"

13 #import "chrome/browser/browser_theme_provider.h"	14 #import "chrome/browser/browser_theme_provider.h"

14 #import "chrome/browser/cocoa/download_item_button.h"	15 #import "chrome/browser/cocoa/download_item_button.h"

15 #import "chrome/browser/cocoa/download_item_cell.h"	16 #import "chrome/browser/cocoa/download_item_cell.h"

16 #include "chrome/browser/cocoa/download_item_mac.h"	17 #include "chrome/browser/cocoa/download_item_mac.h"

17 #import "chrome/browser/cocoa/download_shelf_controller.h"	18 #import "chrome/browser/cocoa/download_shelf_controller.h"

18 #import "chrome/browser/cocoa/themed_window.h"	19 #import "chrome/browser/cocoa/themed_window.h"

19 #import "chrome/browser/cocoa/ui_localizer.h"	20 #import "chrome/browser/cocoa/ui_localizer.h"

(...skipping 364 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
384 [sender setTitle:l10n_util::GetNSStringWithFixup(	385 [sender setTitle:l10n_util::GetNSStringWithFixup(

385 IDS_DOWNLOAD_MENU_PAUSE_ITEM)];	386 IDS_DOWNLOAD_MENU_PAUSE_ITEM)];

386 } else {	387 } else {

387 [sender setTitle:l10n_util::GetNSStringWithFixup(	388 [sender setTitle:l10n_util::GetNSStringWithFixup(

388 IDS_DOWNLOAD_MENU_RESUME_ITEM)];	389 IDS_DOWNLOAD_MENU_RESUME_ITEM)];

389 }	390 }

390 menuBridge_->ExecuteCommand(DownloadShelfContextMenuMac::TOGGLE_PAUSE);	391 menuBridge_->ExecuteCommand(DownloadShelfContextMenuMac::TOGGLE_PAUSE);

391 }	392 }

392	393

393 @end	394 @end

OLD	NEW