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

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

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 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 | Annotate | Revision Log
OLDNEW
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 #include "chrome/browser/cocoa/history_menu_bridge.h" 5 #include "chrome/browser/cocoa/history_menu_bridge.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/stl_util-inl.h" 10 #include "base/stl_util-inl.h"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/sys_string_conversions.h" 13 #include "base/sys_string_conversions.h"
14 #include "chrome/app/chrome_dll_resource.h" // IDC_HISTORY_MENU 14 #include "chrome/app/chrome_command_ids.h" // IDC_HISTORY_MENU
15 #import "chrome/browser/app_controller_mac.h" 15 #import "chrome/browser/app_controller_mac.h"
16 #import "chrome/browser/cocoa/history_menu_cocoa_controller.h" 16 #import "chrome/browser/cocoa/history_menu_cocoa_controller.h"
17 #include "chrome/browser/history/page_usage_data.h" 17 #include "chrome/browser/history/page_usage_data.h"
18 #include "chrome/browser/profile.h" 18 #include "chrome/browser/profile.h"
19 #include "chrome/browser/sessions/session_types.h" 19 #include "chrome/browser/sessions/session_types.h"
20 #include "chrome/common/notification_registrar.h" 20 #include "chrome/common/notification_registrar.h"
21 #include "chrome/common/notification_service.h" 21 #include "chrome/common/notification_service.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "gfx/codec/png_codec.h" 23 #include "gfx/codec/png_codec.h"
24 #include "grit/app_resources.h" 24 #include "grit/app_resources.h"
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) { 461 void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) {
462 DCHECK(item); 462 DCHECK(item);
463 if (item->icon_requested) { 463 if (item->icon_requested) {
464 FaviconService* service = 464 FaviconService* service =
465 profile_->GetFaviconService(Profile::EXPLICIT_ACCESS); 465 profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
466 service->CancelRequest(item->icon_handle); 466 service->CancelRequest(item->icon_handle);
467 item->icon_requested = false; 467 item->icon_requested = false;
468 item->icon_handle = NULL; 468 item->icon_handle = NULL;
469 } 469 }
470 } 470 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698