OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/cocoa/history_menu_bridge.h" | 5 #include "chrome/browser/ui/cocoa/history_menu_bridge.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/sys_string_conversions.h" | 12 #include "base/sys_string_conversions.h" |
13 #include "chrome/app/chrome_command_ids.h" // IDC_HISTORY_MENU | 13 #include "chrome/app/chrome_command_ids.h" // IDC_HISTORY_MENU |
14 #import "chrome/browser/app_controller_mac.h" | 14 #import "chrome/browser/app_controller_mac.h" |
15 #include "chrome/browser/history/page_usage_data.h" | 15 #include "chrome/browser/history/page_usage_data.h" |
16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/sessions/session_types.h" | 17 #include "chrome/browser/sessions/session_types.h" |
18 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 18 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
19 #import "chrome/browser/ui/cocoa/history_menu_cocoa_controller.h" | 19 #import "chrome/browser/ui/cocoa/history_menu_cocoa_controller.h" |
20 #include "chrome/common/chrome_notification_types.h" | 20 #include "chrome/common/chrome_notification_types.h" |
21 #include "chrome/common/url_constants.h" | 21 #include "chrome/common/url_constants.h" |
22 #include "content/public/browser/notification_registrar.h" | 22 #include "content/public/browser/notification_registrar.h" |
23 #include "content/public/browser/notification_source.h" | 23 #include "content/public/browser/notification_source.h" |
24 #include "grit/generated_resources.h" | 24 #include "grit/generated_resources.h" |
25 #include "grit/theme_resources.h" | 25 #include "grit/theme_resources.h" |
26 #include "grit/theme_resources_standard.h" | 26 #include "grit/theme_resources_standard.h" |
27 #include "grit/ui_resources.h" | 27 #include "grit/ui_resources_standard.h" |
28 #include "skia/ext/skia_utils_mac.h" | 28 #include "skia/ext/skia_utils_mac.h" |
29 #include "third_party/skia/include/core/SkBitmap.h" | 29 #include "third_party/skia/include/core/SkBitmap.h" |
30 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
31 #include "ui/base/resource/resource_bundle.h" | 31 #include "ui/base/resource/resource_bundle.h" |
32 #include "ui/gfx/codec/png_codec.h" | 32 #include "ui/gfx/codec/png_codec.h" |
33 #include "ui/gfx/image/image.h" | 33 #include "ui/gfx/image/image.h" |
34 #include "ui/gfx/mac/nsimage_cache.h" | 34 #include "ui/gfx/mac/nsimage_cache.h" |
35 | 35 |
36 namespace { | 36 namespace { |
37 | 37 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 } | 89 } |
90 | 90 |
91 tab_restore_service_ = TabRestoreServiceFactory::GetForProfile(profile_); | 91 tab_restore_service_ = TabRestoreServiceFactory::GetForProfile(profile_); |
92 if (tab_restore_service_) { | 92 if (tab_restore_service_) { |
93 tab_restore_service_->AddObserver(this); | 93 tab_restore_service_->AddObserver(this); |
94 tab_restore_service_->LoadTabsFromLastSession(); | 94 tab_restore_service_->LoadTabsFromLastSession(); |
95 } | 95 } |
96 } | 96 } |
97 | 97 |
98 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 98 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
99 default_favicon_.reset([gfx::GetCachedImageWithName(@"nav.pdf") retain]); | 99 default_favicon_.reset([rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]); |
100 | 100 |
101 // Set the static icons in the menu. | 101 // Set the static icons in the menu. |
102 NSMenuItem* item = [HistoryMenu() itemWithTag:IDC_SHOW_HISTORY]; | 102 NSMenuItem* item = [HistoryMenu() itemWithTag:IDC_SHOW_HISTORY]; |
103 [item setImage:rb.GetNativeImageNamed(IDR_HISTORY_FAVICON)]; | 103 [item setImage:rb.GetNativeImageNamed(IDR_HISTORY_FAVICON)]; |
104 | 104 |
105 // The service is not ready for use yet, so become notified when it does. | 105 // The service is not ready for use yet, so become notified when it does. |
106 if (!history_service_) { | 106 if (!history_service_) { |
107 registrar_.Add( | 107 registrar_.Add( |
108 this, chrome::NOTIFICATION_HISTORY_LOADED, | 108 this, chrome::NOTIFICATION_HISTORY_LOADED, |
109 content::Source<Profile>(profile_)); | 109 content::Source<Profile>(profile_)); |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
484 void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) { | 484 void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) { |
485 DCHECK(item); | 485 DCHECK(item); |
486 if (item->icon_requested) { | 486 if (item->icon_requested) { |
487 FaviconService* service = | 487 FaviconService* service = |
488 profile_->GetFaviconService(Profile::EXPLICIT_ACCESS); | 488 profile_->GetFaviconService(Profile::EXPLICIT_ACCESS); |
489 service->CancelRequest(item->icon_handle); | 489 service->CancelRequest(item->icon_handle); |
490 item->icon_requested = false; | 490 item->icon_requested = false; |
491 item->icon_handle = NULL; | 491 item->icon_handle = NULL; |
492 } | 492 } |
493 } | 493 } |
OLD | NEW |