diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 22:17:08 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 22:17:08 +0000 |
| commit | b3e8008dff86e3b23b44a08a47ac685e3d1d2937 (patch) | |
| tree | 9d5f92b280c885762f2010f5a6cf49060d54d2d6 /chrome/browser/ui/views/tabs | |
| parent | f4e4811175d3b23e64d6dbf97cd3932c1f4f8c27 (diff) | |
| download | chromium_src-b3e8008dff86e3b23b44a08a47ac685e3d1d2937.zip chromium_src-b3e8008dff86e3b23b44a08a47ac685e3d1d2937.tar.gz chromium_src-b3e8008dff86e3b23b44a08a47ac685e3d1d2937.tar.bz2 | |
Revert r187423: "Disable audio indicator tab icon for Chrome OS."
r188038 and https://gerrit.chromium.org/gerrit/45340 mitigates some
of the scheduling problems that we were having in the GPU process.
It is now safe to re-enable this feature.
BUG=181317
Review URL: https://chromiumcodereview.appspot.com/12868003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/tabs')
| -rw-r--r-- | chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 5eb7778..089c48c 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -456,15 +456,10 @@ void BrowserTabStripController::SetTabRendererDataFromModel( else data->capture_state = TabRendererData::CAPTURE_STATE_NONE; -#if !defined(OS_CHROMEOS) if (chrome::IsPlayingAudio(contents)) data->audio_state = TabRendererData::AUDIO_STATE_PLAYING; else data->audio_state = TabRendererData::AUDIO_STATE_NONE; -#else - // Temporarily disable audio indicator on Chrome OS. See crbug.com/180332. - data->audio_state = TabRendererData::AUDIO_STATE_NONE; -#endif } void BrowserTabStripController::SetTabDataAt(content::WebContents* web_contents, |