diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /chrome/browser/cocoa/search_engine_dialog_controller.mm | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'chrome/browser/cocoa/search_engine_dialog_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/search_engine_dialog_controller.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/search_engine_dialog_controller.mm b/chrome/browser/cocoa/search_engine_dialog_controller.mm index 4863c07..044bb58 100644 --- a/chrome/browser/cocoa/search_engine_dialog_controller.mm +++ b/chrome/browser/cocoa/search_engine_dialog_controller.mm @@ -111,7 +111,7 @@ void SearchEngineDialogControllerBridge::OnTemplateURLModelChanged() { [win setBackgroundColor:[NSColor whiteColor]]; NSImage* headerImage = ResourceBundle::GetSharedInstance(). - GetNSImageNamed(IDR_SEARCH_ENGINE_DIALOG_TOP); + GetNativeImageNamed(IDR_SEARCH_ENGINE_DIALOG_TOP); [headerImageView_ setImage:headerImage]; // Is the user's default search engine included in the first three @@ -191,7 +191,7 @@ void SearchEngineDialogControllerBridge::OnTemplateURLModelChanged() { int logoId = engine->logo_id(); if (useImages && logoId > 0) { NSImage* logoImage = - ResourceBundle::GetSharedInstance().GetNSImageNamed(logoId); + ResourceBundle::GetSharedInstance().GetNativeImageNamed(logoId); NSRect logoBounds = NSZeroRect; logoBounds.size = [logoImage size]; NSImageView* logoView = |