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

Unified Diff: ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc

Issue 2758453002: Remove pre-MD code from TrayItemView. (Closed)
Patch Set: bonus round Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/common/system/tray/tray_item_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
diff --git a/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc b/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
index 0029822e5b8bae303e11301f9a6210ce3583a650..439bd60ab6111d8297081db08a98fb33fa3147e9 100644
--- a/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
+++ b/ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc
@@ -11,9 +11,7 @@
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/tray/tray_item_view.h"
#include "ash/common/wm_shell.h"
-#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
-#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/views/controls/image_view.h"
@@ -26,11 +24,8 @@ class MultiProfileMediaTrayView : public TrayItemView,
explicit MultiProfileMediaTrayView(SystemTrayItem* system_tray_item)
: TrayItemView(system_tray_item) {
CreateImageView();
- ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
image_view()->SetImage(
- UseMd()
- ? gfx::CreateVectorIcon(kSystemTrayRecordingIcon, kTrayIconColor)
- : *bundle.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_RECORDING));
+ gfx::CreateVectorIcon(kSystemTrayRecordingIcon, kTrayIconColor));
WmShell::Get()->media_controller()->AddObserver(this);
SetVisible(false);
WmShell::Get()->media_controller()->RequestCaptureState();
« no previous file with comments | « no previous file | ash/common/system/tray/tray_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698