Revert 251163 "Set a reasonable icon for the media galleries sca..."

> Set a reasonable icon for the media galleries scan result dialog folder viewer.
> 
> BUG=334309,161119
> NOTRY=true
> 
> Review URL: https://codereview.chromium.org/130263007

TBR=vandebo@chromium.org

Review URL: https://codereview.chromium.org/164373003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251171 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/theme/theme_resources.grd

@@ -237,12 +237,12 @@
       <structure type="chrome_scaled_image" name="IDR_FEEDBACK_H" file="feedback_hover.png" />
       <structure type="chrome_scaled_image" name="IDR_FEEDBACK_P" file="feedback_pressed.png" />
 
-      <structure type="chrome_scaled_image" name="IDR_FILE_FOLDER" file="common/folder.png" />
       <if expr="pp_ifdef('chromeos')">
         <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_ARCHIVE" file="cros/file_types/archive.png" />
         <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO" file="cros/file_types/audio.png" />
         <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_DRIVE" file="cros/file_types/drive.png" />
         <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_EXCEL" file="cros/file_types/excel.png" />
+        <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_FOLDER" file="cros/file_types/folder.png" />
         <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_FORM" file="cros/file_types/form.png" />
         <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_GDOC" file="cros/file_types/gdoc.png" />
         <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_GDRAW" file="cros/file_types/gdraw.png" />

chrome/browser/ui/cocoa/extensions/media_galleries_scan_result_dialog_cocoa.mm

@@ -274,10 +274,9 @@ void MediaGalleriesScanResultDialogCocoa::UpdateScanResultCheckbox(
     [folder_viewer setAction:@selector(onFolderViewClicked:)];
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    [folder_viewer setImage:rb.GetNativeImageNamed(
-        IDR_FILE_FOLDER).ToNSImage()];
+    [folder_viewer setImage:
+        rb.GetNativeImageNamed(IDR_UPDATE_FAILED).ToNSImage()];
     [folder_viewer setTitle:nil];
-    [folder_viewer setBordered:false];
     [folder_viewer setToolTip:
         base::SysUTF16ToNSString(gallery.GetGalleryTooltip())];
     [folder_viewer sizeToFit];

chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc

@@ -11,7 +11,6 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -192,9 +191,7 @@ bool MediaGalleriesScanResultDialogViews::AddOrUpdateScanResult(
   views::ImageButton* folder_viewer_button = new views::ImageButton(this);
   folder_viewer_button->set_context_menu_controller(this);
   folder_viewer_button->SetImage(views::ImageButton::STATE_NORMAL,
-                                 rb.GetImageSkiaNamed(IDR_FILE_FOLDER));
-  folder_viewer_button->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
-                                          views::ImageButton::ALIGN_MIDDLE);
+                                 rb.GetImageSkiaNamed(IDR_OAK));
   folder_viewer_button->SetAccessibleName(l10n_util::GetStringUTF16(
       IDS_MEDIA_GALLERIES_SCAN_RESULT_OPEN_FOLDER_VIEW_ACCESSIBILITY_NAME));
   folder_viewer_button->SetFocusable(true);