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

Unified Diff: chrome/browser/ui/tabs/tab_utils.cc

Issue 2401363005: Remove sundry IsModeMaterial checks. (Closed)
Patch Set: resolve merge conflict Created 4 years, 2 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
Index: chrome/browser/ui/tabs/tab_utils.cc
diff --git a/chrome/browser/ui/tabs/tab_utils.cc b/chrome/browser/ui/tabs/tab_utils.cc
index 59a2e1e1e3b0ef79f852e98b09fb859a5612da9f..bfaa2744ea407cbe64c9f862d1deac747f6e5f2b 100644
--- a/chrome/browser/ui/tabs/tab_utils.cc
+++ b/chrome/browser/ui/tabs/tab_utils.cc
@@ -177,30 +177,6 @@ TabAlertState GetTabAlertStateForContents(content::WebContents* contents) {
gfx::Image GetTabAlertIndicatorImage(TabAlertState alert_state,
SkColor button_color) {
-#if defined(OS_MACOSX)
- if (!ui::MaterialDesignController::IsModeMaterial()) {
- ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
- switch (alert_state) {
- case TabAlertState::AUDIO_PLAYING:
- return rb->GetNativeImageNamed(IDR_TAB_AUDIO_INDICATOR);
- case TabAlertState::AUDIO_MUTING:
- return rb->GetNativeImageNamed(IDR_TAB_AUDIO_MUTING_INDICATOR);
- case TabAlertState::MEDIA_RECORDING:
- return rb->GetNativeImageNamed(IDR_TAB_RECORDING_INDICATOR);
- case TabAlertState::TAB_CAPTURING:
- return rb->GetNativeImageNamed(IDR_TAB_CAPTURE_INDICATOR);
- case TabAlertState::BLUETOOTH_CONNECTED:
- return rb->GetNativeImageNamed(IDR_TAB_BLUETOOTH_INDICATOR);
- case TabAlertState::USB_CONNECTED:
- return rb->GetNativeImageNamed(IDR_TAB_USB_INDICATOR);
- case TabAlertState::NONE:
- break;
- }
- NOTREACHED();
- return gfx::Image();
- }
-#endif
-
gfx::VectorIconId icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
switch (alert_state) {
case TabAlertState::AUDIO_PLAYING:
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('k') | chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698