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

Side by Side Diff: chrome/browser/ui/tabs/tab_utils.h

Issue 591963002: Tab audio mute control (views UI), behind a switch (off by default). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed mpearson's comments; added a few CloseTab UMA's. Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_TABS_TAB_UTILS_H_ 5 #ifndef CHROME_BROWSER_UI_TABS_TAB_UTILS_H_
6 #define CHROME_BROWSER_UI_TABS_TAB_UTILS_H_ 6 #define CHROME_BROWSER_UI_TABS_TAB_UTILS_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 10
11 namespace content { 11 namespace content {
12 class WebContents; 12 class WebContents;
13 } // namespace content 13 } // namespace content
14 14
15 namespace gfx { 15 namespace gfx {
16 class Animation; 16 class Animation;
17 class Image; 17 class Image;
18 } // namespace gfx 18 } // namespace gfx
19 19
20 // Media state for a tab. In reality, more than one of these may apply. See 20 // Media state for a tab. In reality, more than one of these may apply. See
21 // comments for GetTabMediaStateForContents() below. 21 // comments for GetTabMediaStateForContents() below.
22 enum TabMediaState { 22 enum TabMediaState {
23 TAB_MEDIA_STATE_NONE, 23 TAB_MEDIA_STATE_NONE,
24 TAB_MEDIA_STATE_RECORDING, // Audio/Video being recorded, consumed by tab. 24 TAB_MEDIA_STATE_RECORDING, // Audio/Video being recorded, consumed by tab.
25 TAB_MEDIA_STATE_CAPTURING, // Tab contents being captured. 25 TAB_MEDIA_STATE_CAPTURING, // Tab contents being captured.
26 TAB_MEDIA_STATE_AUDIO_PLAYING // Audible audio is playing from the tab. 26 TAB_MEDIA_STATE_AUDIO_PLAYING, // Audible audio is playing from the tab.
27 TAB_MEDIA_STATE_AUDIO_MUTING, // Tab audio is being muted.
27 }; 28 };
28 29
29 namespace chrome { 30 namespace chrome {
30 31
31 // Logic to determine which components (i.e., close button, favicon, and media 32 // Logic to determine which components (i.e., close button, favicon, and media
32 // indicator) of a tab should be shown, given current state. |capacity| 33 // indicator) of a tab should be shown, given current state. |capacity|
33 // specifies how many components can be shown, given available tab width. 34 // specifies how many components can be shown, given available tab width.
34 // 35 //
35 // Precedence rules for deciding what to show when capacity is insufficient to 36 // Precedence rules for deciding what to show when capacity is insufficient to
36 // show everything: 37 // show everything:
(...skipping 23 matching lines...) Expand all
60 61
61 // Returns the media state to be shown by the tab's media indicator. When 62 // Returns the media state to be shown by the tab's media indicator. When
62 // multiple states apply (e.g., tab capture with audio playback), the one most 63 // multiple states apply (e.g., tab capture with audio playback), the one most
63 // relevant to user privacy concerns is selected. 64 // relevant to user privacy concerns is selected.
64 TabMediaState GetTabMediaStateForContents(content::WebContents* contents); 65 TabMediaState GetTabMediaStateForContents(content::WebContents* contents);
65 66
66 // Returns a cached image, to be shown by the media indicator for the given 67 // Returns a cached image, to be shown by the media indicator for the given
67 // |media_state|. Uses the global ui::ResourceBundle shared instance. 68 // |media_state|. Uses the global ui::ResourceBundle shared instance.
68 const gfx::Image& GetTabMediaIndicatorImage(TabMediaState media_state); 69 const gfx::Image& GetTabMediaIndicatorImage(TabMediaState media_state);
69 70
71 // Returns the cached image, to be shown by the media indicator button for mouse
72 // hover/pressed, when the indicator is in the given |media_state|. Uses the
73 // global ui::ResourceBundle shared instance.
74 const gfx::Image& GetTabMediaIndicatorAffordanceImage(
75 TabMediaState media_state);
76
70 // Returns a non-continuous Animation that performs a fade-in or fade-out 77 // Returns a non-continuous Animation that performs a fade-in or fade-out
71 // appropriate for the given |next_media_state|. This is used by the tab media 78 // appropriate for the given |next_media_state|. This is used by the tab media
72 // indicator to alert the user that recording, tab capture, or audio playback 79 // indicator to alert the user that recording, tab capture, or audio playback
73 // has started/stopped. 80 // has started/stopped.
74 scoped_ptr<gfx::Animation> CreateTabMediaIndicatorFadeAnimation( 81 scoped_ptr<gfx::Animation> CreateTabMediaIndicatorFadeAnimation(
75 TabMediaState next_media_state); 82 TabMediaState next_media_state);
76 83
77 // Returns the text to show in a tab's tooltip: The contents |title|, followed 84 // Returns the text to show in a tab's tooltip: The contents |title|, followed
78 // by a break, followed by a localized string describing the |media_state|. 85 // by a break, followed by a localized string describing the |media_state|.
79 base::string16 AssembleTabTooltipText(const base::string16& title, 86 base::string16 AssembleTabTooltipText(const base::string16& title,
80 TabMediaState media_state); 87 TabMediaState media_state);
81 88
89 // Returns true if the experimental tab audio mute feature is enabled.
90 bool IsTabAudioMutingFeatureEnabled();
91
92 // Returns true if audio mute can be activated/deactivated for the given
93 // |contents|.
94 bool CanToggleAudioMute(content::WebContents* contents);
95
82 } // namespace chrome 96 } // namespace chrome
83 97
84 #endif // CHROME_BROWSER_UI_TABS_TAB_UTILS_H_ 98 #endif // CHROME_BROWSER_UI_TABS_TAB_UTILS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698