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

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

Issue 1746333002: bluetooth: Show tab indicator when BT device is connected (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: mute -> connected Created 4 years, 8 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 #include "chrome/browser/ui/tabs/tab_utils.h" 5 #include "chrome/browser/ui/tabs/tab_utils.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 scoped_refptr<MediaStreamCaptureIndicator> indicator = 152 scoped_refptr<MediaStreamCaptureIndicator> indicator =
153 MediaCaptureDevicesDispatcher::GetInstance()-> 153 MediaCaptureDevicesDispatcher::GetInstance()->
154 GetMediaStreamCaptureIndicator(); 154 GetMediaStreamCaptureIndicator();
155 if (indicator.get()) { 155 if (indicator.get()) {
156 if (indicator->IsBeingMirrored(contents)) 156 if (indicator->IsBeingMirrored(contents))
157 return TAB_MEDIA_STATE_CAPTURING; 157 return TAB_MEDIA_STATE_CAPTURING;
158 if (indicator->IsCapturingUserMedia(contents)) 158 if (indicator->IsCapturingUserMedia(contents))
159 return TAB_MEDIA_STATE_RECORDING; 159 return TAB_MEDIA_STATE_RECORDING;
160 } 160 }
161 161
162 if (contents->IsBluetoothDeviceConnected())
163 return TAB_MEDIA_STATE_BLUETOOTH_CONNECTED;
164
162 if (contents->IsAudioMuted()) 165 if (contents->IsAudioMuted())
163 return TAB_MEDIA_STATE_AUDIO_MUTING; 166 return TAB_MEDIA_STATE_AUDIO_MUTING;
164 if (contents->WasRecentlyAudible()) 167 if (contents->WasRecentlyAudible())
165 return TAB_MEDIA_STATE_AUDIO_PLAYING; 168 return TAB_MEDIA_STATE_AUDIO_PLAYING;
166 169
167 return TAB_MEDIA_STATE_NONE; 170 return TAB_MEDIA_STATE_NONE;
168 } 171 }
169 172
170 gfx::Image GetTabMediaIndicatorImage(TabMediaState media_state, 173 gfx::Image GetTabMediaIndicatorImage(TabMediaState media_state,
171 SkColor button_color) { 174 SkColor button_color) {
172 #if defined(OS_MACOSX) 175 #if defined(OS_MACOSX)
173 ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); 176 ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
174 switch (media_state) { 177 switch (media_state) {
175 case TAB_MEDIA_STATE_AUDIO_PLAYING: 178 case TAB_MEDIA_STATE_AUDIO_PLAYING:
176 return rb->GetNativeImageNamed(IDR_TAB_AUDIO_INDICATOR); 179 return rb->GetNativeImageNamed(IDR_TAB_AUDIO_INDICATOR);
177 case TAB_MEDIA_STATE_AUDIO_MUTING: 180 case TAB_MEDIA_STATE_AUDIO_MUTING:
178 return rb->GetNativeImageNamed(IDR_TAB_AUDIO_MUTING_INDICATOR); 181 return rb->GetNativeImageNamed(IDR_TAB_AUDIO_MUTING_INDICATOR);
179 case TAB_MEDIA_STATE_RECORDING: 182 case TAB_MEDIA_STATE_RECORDING:
180 return rb->GetNativeImageNamed(IDR_TAB_RECORDING_INDICATOR); 183 return rb->GetNativeImageNamed(IDR_TAB_RECORDING_INDICATOR);
181 case TAB_MEDIA_STATE_CAPTURING: 184 case TAB_MEDIA_STATE_CAPTURING:
182 return rb->GetNativeImageNamed(IDR_TAB_CAPTURE_INDICATOR); 185 return rb->GetNativeImageNamed(IDR_TAB_CAPTURE_INDICATOR);
186 case TAB_MEDIA_STATE_BLUETOOTH_CONNECTED:
187 return rb->GetNativeImageNamed(IDR_TAB_BLUETOOTH_INDICATOR);
183 case TAB_MEDIA_STATE_NONE: 188 case TAB_MEDIA_STATE_NONE:
184 break; 189 break;
185 } 190 }
186 #else 191 #else
187 gfx::VectorIconId icon_id = gfx::VectorIconId::VECTOR_ICON_NONE; 192 gfx::VectorIconId icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
188 switch (media_state) { 193 switch (media_state) {
189 case TAB_MEDIA_STATE_AUDIO_PLAYING: 194 case TAB_MEDIA_STATE_AUDIO_PLAYING:
190 icon_id = gfx::VectorIconId::TAB_AUDIO; 195 icon_id = gfx::VectorIconId::TAB_AUDIO;
191 break; 196 break;
192 case TAB_MEDIA_STATE_AUDIO_MUTING: 197 case TAB_MEDIA_STATE_AUDIO_MUTING:
193 icon_id = gfx::VectorIconId::TAB_AUDIO_MUTING; 198 icon_id = gfx::VectorIconId::TAB_AUDIO_MUTING;
194 break; 199 break;
195 case TAB_MEDIA_STATE_RECORDING: 200 case TAB_MEDIA_STATE_RECORDING:
196 icon_id = gfx::VectorIconId::TAB_MEDIA_RECORDING; 201 icon_id = gfx::VectorIconId::TAB_MEDIA_RECORDING;
197 break; 202 break;
198 case TAB_MEDIA_STATE_CAPTURING: 203 case TAB_MEDIA_STATE_CAPTURING:
199 icon_id = gfx::VectorIconId::TAB_MEDIA_CAPTURING; 204 icon_id = gfx::VectorIconId::TAB_MEDIA_CAPTURING;
200 break; 205 break;
206 case TAB_MEDIA_STATE_BLUETOOTH_CONNECTED:
207 icon_id = gfx::VectorIconId::TAB_BLUETOOTH_CONNECTED;
208 break;
201 case TAB_MEDIA_STATE_NONE: 209 case TAB_MEDIA_STATE_NONE:
202 break; 210 break;
203 } 211 }
204 if (icon_id != gfx::VectorIconId::VECTOR_ICON_NONE) 212 if (icon_id != gfx::VectorIconId::VECTOR_ICON_NONE)
205 return gfx::Image(gfx::CreateVectorIcon(icon_id, 16, button_color)); 213 return gfx::Image(gfx::CreateVectorIcon(icon_id, 16, button_color));
206 #endif 214 #endif
207 NOTREACHED(); 215 NOTREACHED();
208 return gfx::Image(); 216 return gfx::Image();
209 } 217 }
210 218
211 gfx::Image GetTabMediaIndicatorAffordanceImage(TabMediaState media_state, 219 gfx::Image GetTabMediaIndicatorAffordanceImage(TabMediaState media_state,
212 SkColor button_color) { 220 SkColor button_color) {
213 switch (media_state) { 221 switch (media_state) {
214 case TAB_MEDIA_STATE_AUDIO_PLAYING: 222 case TAB_MEDIA_STATE_AUDIO_PLAYING:
215 return GetTabMediaIndicatorImage(TAB_MEDIA_STATE_AUDIO_MUTING, 223 return GetTabMediaIndicatorImage(TAB_MEDIA_STATE_AUDIO_MUTING,
216 button_color); 224 button_color);
217 case TAB_MEDIA_STATE_AUDIO_MUTING: 225 case TAB_MEDIA_STATE_AUDIO_MUTING:
218 case TAB_MEDIA_STATE_NONE: 226 case TAB_MEDIA_STATE_NONE:
219 case TAB_MEDIA_STATE_RECORDING: 227 case TAB_MEDIA_STATE_RECORDING:
220 case TAB_MEDIA_STATE_CAPTURING: 228 case TAB_MEDIA_STATE_CAPTURING:
229 case TAB_MEDIA_STATE_BLUETOOTH_CONNECTED:
221 return GetTabMediaIndicatorImage(media_state, button_color); 230 return GetTabMediaIndicatorImage(media_state, button_color);
222 } 231 }
223 NOTREACHED(); 232 NOTREACHED();
224 return GetTabMediaIndicatorImage(media_state, button_color); 233 return GetTabMediaIndicatorImage(media_state, button_color);
225 } 234 }
226 235
227 scoped_ptr<gfx::Animation> CreateTabMediaIndicatorFadeAnimation( 236 scoped_ptr<gfx::Animation> CreateTabMediaIndicatorFadeAnimation(
228 TabMediaState media_state) { 237 TabMediaState media_state) {
229 if (media_state == TAB_MEDIA_STATE_RECORDING || 238 if (media_state == TAB_MEDIA_STATE_RECORDING ||
230 media_state == TAB_MEDIA_STATE_CAPTURING) { 239 media_state == TAB_MEDIA_STATE_CAPTURING) {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_MEDIA_STATE_AUDIO_MUTING)); 273 l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_MEDIA_STATE_AUDIO_MUTING));
265 break; 274 break;
266 case TAB_MEDIA_STATE_RECORDING: 275 case TAB_MEDIA_STATE_RECORDING:
267 result.append( 276 result.append(
268 l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_MEDIA_STATE_RECORDING)); 277 l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_MEDIA_STATE_RECORDING));
269 break; 278 break;
270 case TAB_MEDIA_STATE_CAPTURING: 279 case TAB_MEDIA_STATE_CAPTURING:
271 result.append( 280 result.append(
272 l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_MEDIA_STATE_CAPTURING)); 281 l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_MEDIA_STATE_CAPTURING));
273 break; 282 break;
283 case TAB_MEDIA_STATE_BLUETOOTH_CONNECTED:
284 result.append(
285 l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_BLUETOOTH_CONNECTED));
286 break;
274 case TAB_MEDIA_STATE_NONE: 287 case TAB_MEDIA_STATE_NONE:
275 NOTREACHED(); 288 NOTREACHED();
276 break; 289 break;
277 } 290 }
278 return result; 291 return result;
279 } 292 }
280 293
281 bool AreExperimentalMuteControlsEnabled() { 294 bool AreExperimentalMuteControlsEnabled() {
282 return base::CommandLine::ForCurrentProcess()->HasSwitch( 295 return base::CommandLine::ForCurrentProcess()->HasSwitch(
283 switches::kEnableTabAudioMuting); 296 switches::kEnableTabAudioMuting);
284 } 297 }
285 298
286 bool CanToggleAudioMute(content::WebContents* contents) { 299 bool CanToggleAudioMute(content::WebContents* contents) {
287 switch (GetTabMediaStateForContents(contents)) { 300 switch (GetTabMediaStateForContents(contents)) {
288 case TAB_MEDIA_STATE_NONE: 301 case TAB_MEDIA_STATE_NONE:
289 case TAB_MEDIA_STATE_AUDIO_PLAYING: 302 case TAB_MEDIA_STATE_AUDIO_PLAYING:
290 case TAB_MEDIA_STATE_AUDIO_MUTING: 303 case TAB_MEDIA_STATE_AUDIO_MUTING:
291 return true; 304 return true;
292 case TAB_MEDIA_STATE_RECORDING: 305 case TAB_MEDIA_STATE_RECORDING:
293 case TAB_MEDIA_STATE_CAPTURING: 306 case TAB_MEDIA_STATE_CAPTURING:
307 case TAB_MEDIA_STATE_BLUETOOTH_CONNECTED:
294 return false; 308 return false;
295 } 309 }
296 NOTREACHED(); 310 NOTREACHED();
297 return false; 311 return false;
298 } 312 }
299 313
300 TabMutedReason GetTabAudioMutedReason(content::WebContents* contents) { 314 TabMutedReason GetTabAudioMutedReason(content::WebContents* contents) {
301 LastMuteMetadata::CreateForWebContents(contents); // Ensures metadata exists. 315 LastMuteMetadata::CreateForWebContents(contents); // Ensures metadata exists.
302 LastMuteMetadata* const metadata = 316 LastMuteMetadata* const metadata =
303 LastMuteMetadata::FromWebContents(contents); 317 LastMuteMetadata::FromWebContents(contents);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 const std::vector<int>& indices) { 375 const std::vector<int>& indices) {
362 for (std::vector<int>::const_iterator i = indices.begin(); i != indices.end(); 376 for (std::vector<int>::const_iterator i = indices.begin(); i != indices.end();
363 ++i) { 377 ++i) {
364 if (!tab_strip.GetWebContentsAt(*i)->IsAudioMuted()) 378 if (!tab_strip.GetWebContentsAt(*i)->IsAudioMuted())
365 return false; 379 return false;
366 } 380 }
367 return true; 381 return true;
368 } 382 }
369 383
370 } // namespace chrome 384 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/tabs/tab_utils.h ('k') | content/browser/bluetooth/bluetooth_dispatcher_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698