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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/media_galleries_scan_result_dialog_cocoa.mm

Issue 130263007: Set a reasonable icon for the media galleries scan result dialog folder viewer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename Created 6 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/extensions/media_galleries_scan_result_dialog_ cocoa.h" 5 #include "chrome/browser/ui/cocoa/extensions/media_galleries_scan_result_dialog_ cocoa.h"
6 6
7 #include "base/mac/foundation_util.h" 7 #include "base/mac/foundation_util.h"
8 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 #include "chrome/browser/ui/chrome_style.h" 10 #include "chrome/browser/ui/chrome_style.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 if (gallery.IsGalleryAvailable()) { 267 if (gallery.IsGalleryAvailable()) {
268 folder_viewer.reset( 268 folder_viewer.reset(
269 [[MediaGalleriesScanResultButton alloc] initWithFrame:NSZeroRect 269 [[MediaGalleriesScanResultButton alloc] initWithFrame:NSZeroRect
270 dialog:this 270 dialog:this
271 prefId:gallery.pref_id]); 271 prefId:gallery.pref_id]);
272 [folder_viewer setButtonType:NSMomentaryChangeButton]; 272 [folder_viewer setButtonType:NSMomentaryChangeButton];
273 [folder_viewer setTarget:cocoa_controller_]; 273 [folder_viewer setTarget:cocoa_controller_];
274 [folder_viewer setAction:@selector(onFolderViewClicked:)]; 274 [folder_viewer setAction:@selector(onFolderViewClicked:)];
275 275
276 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 276 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
277 [folder_viewer setImage: 277 [folder_viewer setImage:rb.GetNativeImageNamed(
278 rb.GetNativeImageNamed(IDR_UPDATE_FAILED).ToNSImage()]; 278 IDR_FILE_FOLDER).ToNSImage()];
279 [folder_viewer setTitle:nil]; 279 [folder_viewer setTitle:nil];
280 [folder_viewer setBordered:false];
280 [folder_viewer setToolTip: 281 [folder_viewer setToolTip:
281 base::SysUTF16ToNSString(gallery.GetGalleryTooltip())]; 282 base::SysUTF16ToNSString(gallery.GetGalleryTooltip())];
282 [folder_viewer sizeToFit]; 283 [folder_viewer sizeToFit];
283 folder_viewer_rect = [folder_viewer bounds]; 284 folder_viewer_rect = [folder_viewer bounds];
284 } else { 285 } else {
285 folder_viewer_rect.size.width = -kCheckboxMargin; 286 folder_viewer_rect.size.width = -kCheckboxMargin;
286 } 287 }
287 288
288 // Additional details text. 289 // Additional details text.
289 base::scoped_nsobject<NSTextField> details( 290 base::scoped_nsobject<NSTextField> details(
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 return controller_->GetContextMenu(prefid); 355 return controller_->GetContextMenu(prefid);
355 } 356 }
356 357
357 // static 358 // static
358 MediaGalleriesScanResultDialog* MediaGalleriesScanResultDialog::Create( 359 MediaGalleriesScanResultDialog* MediaGalleriesScanResultDialog::Create(
359 MediaGalleriesScanResultDialogController* controller) { 360 MediaGalleriesScanResultDialogController* controller) {
360 base::scoped_nsobject<MediaGalleriesScanResultCocoaController> 361 base::scoped_nsobject<MediaGalleriesScanResultCocoaController>
361 cocoa_controller([[MediaGalleriesScanResultCocoaController alloc] init]); 362 cocoa_controller([[MediaGalleriesScanResultCocoaController alloc] init]);
362 return new MediaGalleriesScanResultDialogCocoa(controller, cocoa_controller); 363 return new MediaGalleriesScanResultDialogCocoa(controller, cocoa_controller);
363 } 364 }
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698