Merge 143605 - grd file update for new 2x assets

chrome/browser/chromeos/extensions/file_browser_notifications.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/file_browser_notifications.h"
 
 #include "ash/ash_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/notifications/system_notification.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 int GetIconId(FileBrowserNotifications::NotificationType type) {
   switch (type) {
     case FileBrowserNotifications::DEVICE:
     case FileBrowserNotifications::FORMAT_SUCCESS:
     case FileBrowserNotifications::FORMAT_START:
@@ skipping 357 matching lines @@
 void FileBrowserNotifications::HideNotificationById(const std::string& id) {
   NotificationMap::iterator it = notification_map_.find(id);
   if (it != notification_map_.end()) {
     delete it->second;
     notification_map_.erase(it);
   } else {
     // Mark as hidden so it does not get shown from a delayed task.
     hidden_notifications_.insert(id);
   }
 }