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

Side by Side Diff: chrome/browser/media/media_stream_capture_indicator.cc

Issue 11236052: Indicate tab recording state in tab strip (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always add capture devices Created 8 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 unified diff | Download patch | Annotate | Revision Log
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/media/media_stream_capture_indicator.h" 5 #include "chrome/browser/media/media_stream_capture_indicator.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/app/chrome_command_ids.h" 11 #include "chrome/app/chrome_command_ids.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/status_icons/status_icon.h" 15 #include "chrome/browser/status_icons/status_icon.h"
16 #include "chrome/browser/status_icons/status_tray.h" 16 #include "chrome/browser/status_icons/status_tray.h"
17 #include "chrome/browser/tab_contents/tab_util.h" 17 #include "chrome/browser/tab_contents/tab_util.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/content_browser_client.h" 19 #include "content/public/browser/content_browser_client.h"
20 #include "content/public/browser/invalidate_type.h"
20 #include "content/public/browser/render_view_host.h" 21 #include "content/public/browser/render_view_host.h"
21 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
22 #include "content/public/browser/web_contents_delegate.h" 23 #include "content/public/browser/web_contents_delegate.h"
23 #include "content/public/common/media_stream_request.h" 24 #include "content/public/common/media_stream_request.h"
24 #include "grit/chromium_strings.h" 25 #include "grit/chromium_strings.h"
25 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
26 #include "grit/theme_resources.h" 27 #include "grit/theme_resources.h"
27 #include "net/base/net_util.h" 28 #include "net/base/net_util.h"
28 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 const MediaStreamCaptureIndicator::CaptureDeviceTab& tab) { 118 const MediaStreamCaptureIndicator::CaptureDeviceTab& tab) {
118 return (render_process_id_ == tab.render_process_id && 119 return (render_process_id_ == tab.render_process_id &&
119 render_view_id_ == tab.render_view_id); 120 render_view_id_ == tab.render_view_id);
120 } 121 }
121 122
122 MediaStreamCaptureIndicator::MediaStreamCaptureIndicator() 123 MediaStreamCaptureIndicator::MediaStreamCaptureIndicator()
123 : status_icon_(NULL), 124 : status_icon_(NULL),
124 mic_image_(NULL), 125 mic_image_(NULL),
125 camera_image_(NULL), 126 camera_image_(NULL),
126 balloon_image_(NULL), 127 balloon_image_(NULL),
127 request_index_(0) { 128 request_index_(0),
129 weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
128 } 130 }
129 131
130 MediaStreamCaptureIndicator::~MediaStreamCaptureIndicator() { 132 MediaStreamCaptureIndicator::~MediaStreamCaptureIndicator() {
131 // The user is responsible for cleaning up by closing all the opened devices. 133 // The user is responsible for cleaning up by closing all the opened devices.
132 DCHECK(tabs_.empty()); 134 DCHECK(tabs_.empty());
133 } 135 }
134 136
135 bool MediaStreamCaptureIndicator::IsCommandIdChecked( 137 bool MediaStreamCaptureIndicator::IsCommandIdChecked(
136 int command_id) const { 138 int command_id) const {
137 NOTIMPLEMENTED() << "There are no checked items in the MediaStream menu."; 139 NOTIMPLEMENTED() << "There are no checked items in the MediaStream menu.";
(...skipping 30 matching lines...) Expand all
168 void MediaStreamCaptureIndicator::CaptureDevicesOpened( 170 void MediaStreamCaptureIndicator::CaptureDevicesOpened(
169 int render_process_id, 171 int render_process_id,
170 int render_view_id, 172 int render_view_id,
171 const content::MediaStreamDevices& devices) { 173 const content::MediaStreamDevices& devices) {
172 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 174 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
173 DCHECK(!devices.empty()); 175 DCHECK(!devices.empty());
174 176
175 BrowserThread::PostTask( 177 BrowserThread::PostTask(
176 BrowserThread::UI, FROM_HERE, 178 BrowserThread::UI, FROM_HERE,
177 base::Bind(&MediaStreamCaptureIndicator::DoDevicesOpenedOnUIThread, 179 base::Bind(&MediaStreamCaptureIndicator::DoDevicesOpenedOnUIThread,
178 this, render_process_id, render_view_id, devices)); 180 weak_ptr_factory_.GetWeakPtr(),
181 render_process_id, render_view_id, devices));
179 } 182 }
180 183
181 void MediaStreamCaptureIndicator::CaptureDevicesClosed( 184 void MediaStreamCaptureIndicator::CaptureDevicesClosed(
182 int render_process_id, 185 int render_process_id,
183 int render_view_id, 186 int render_view_id,
184 const content::MediaStreamDevices& devices) { 187 const content::MediaStreamDevices& devices) {
185 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 188 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
186 DCHECK(!devices.empty()); 189 DCHECK(!devices.empty());
187 190
188 BrowserThread::PostTask( 191 BrowserThread::PostTask(
189 BrowserThread::UI, FROM_HERE, 192 BrowserThread::UI, FROM_HERE,
190 base::Bind(&MediaStreamCaptureIndicator::DoDevicesClosedOnUIThread, 193 base::Bind(&MediaStreamCaptureIndicator::DoDevicesClosedOnUIThread,
191 this, render_process_id, render_view_id, devices)); 194 weak_ptr_factory_.GetWeakPtr(),
195 render_process_id, render_view_id, devices));
192 } 196 }
193 197
194 void MediaStreamCaptureIndicator::DoDevicesOpenedOnUIThread( 198 void MediaStreamCaptureIndicator::DoDevicesOpenedOnUIThread(
195 int render_process_id, 199 int render_process_id,
196 int render_view_id, 200 int render_view_id,
197 const content::MediaStreamDevices& devices) { 201 const content::MediaStreamDevices& devices) {
198 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 202 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
199 203
200 CreateStatusTray(); 204 CreateStatusTray();
201 205
202 // If we don't have a status icon or one could not be created successfully,
203 // then no need to continue.
204 if (!status_icon_)
205 return;
206
207 AddCaptureDeviceTab(render_process_id, render_view_id, devices); 206 AddCaptureDeviceTab(render_process_id, render_view_id, devices);
208 } 207 }
209 208
210 void MediaStreamCaptureIndicator::DoDevicesClosedOnUIThread( 209 void MediaStreamCaptureIndicator::DoDevicesClosedOnUIThread(
211 int render_process_id, 210 int render_process_id,
212 int render_view_id, 211 int render_view_id,
213 const content::MediaStreamDevices& devices) { 212 const content::MediaStreamDevices& devices) {
214 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 213 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
215 if (!status_icon_)
216 return;
217 214
218 RemoveCaptureDeviceTab(render_process_id, render_view_id, devices); 215 RemoveCaptureDeviceTab(render_process_id, render_view_id, devices);
219 } 216 }
220 217
221 void MediaStreamCaptureIndicator::CreateStatusTray() { 218 void MediaStreamCaptureIndicator::CreateStatusTray() {
222 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 219 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
223 if (status_icon_) 220 if (status_icon_)
224 return; 221 return;
225 222
226 // If there is no browser process, we should not create the status tray. 223 // If there is no browser process, we should not create the status tray.
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 ++iter->audio_ref_count; 405 ++iter->audio_ref_count;
409 audio = true; 406 audio = true;
410 } else if (content::IsVideoMediaType(dev->type)) { 407 } else if (content::IsVideoMediaType(dev->type)) {
411 ++iter->video_ref_count; 408 ++iter->video_ref_count;
412 video = true; 409 video = true;
413 } else { 410 } else {
414 NOTIMPLEMENTED(); 411 NOTIMPLEMENTED();
415 } 412 }
416 } 413 }
417 414
415 WebContents* web_contents = tab_util::GetWebContentsByID(
416 render_process_id, render_view_id);
417 web_contents->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
418
419 if (!status_icon_)
420 return;
421
418 UpdateStatusTrayIconContextMenu(); 422 UpdateStatusTrayIconContextMenu();
419 423
420 ShowBalloon(render_process_id, render_view_id, audio, video); 424 ShowBalloon(render_process_id, render_view_id, audio, video);
421 } 425 }
422 426
423 void MediaStreamCaptureIndicator::RemoveCaptureDeviceTab( 427 void MediaStreamCaptureIndicator::RemoveCaptureDeviceTab(
424 int render_process_id, 428 int render_process_id,
425 int render_view_id, 429 int render_view_id,
426 const content::MediaStreamDevices& devices) { 430 const content::MediaStreamDevices& devices) {
427 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 431 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
(...skipping 13 matching lines...) Expand all
441 445
442 DCHECK_GE(iter->audio_ref_count, 0); 446 DCHECK_GE(iter->audio_ref_count, 0);
443 DCHECK_GE(iter->video_ref_count, 0); 447 DCHECK_GE(iter->video_ref_count, 0);
444 } 448 }
445 449
446 // Remove the tab if all the devices have been closed. 450 // Remove the tab if all the devices have been closed.
447 if (iter->audio_ref_count == 0 && iter->video_ref_count == 0) 451 if (iter->audio_ref_count == 0 && iter->video_ref_count == 0)
448 tabs_.erase(iter); 452 tabs_.erase(iter);
449 } 453 }
450 454
455 if (!status_icon_)
456 return;
457
451 UpdateStatusTrayIconContextMenu(); 458 UpdateStatusTrayIconContextMenu();
452 } 459 }
453 460
461 bool MediaStreamCaptureIndicator::IsProcessCapturing(int render_process_id,
462 int render_view_id) const {
463 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
464 CaptureDeviceTabs::const_iterator iter = std::find_if(
465 tabs_.begin(), tabs_.end(), TabEquals(render_process_id, render_view_id));
466 if (iter == tabs_.end())
467 return false;
468 return (iter->audio_ref_count > 0 || iter->video_ref_count > 0);
469 }
470
454 void MediaStreamCaptureIndicator::EnsureImageLoadingTracker() { 471 void MediaStreamCaptureIndicator::EnsureImageLoadingTracker() {
455 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 472 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
456 if (tracker_.get()) 473 if (tracker_.get())
457 return; 474 return;
458 475
459 tracker_.reset(new ImageLoadingTracker(this)); 476 tracker_.reset(new ImageLoadingTracker(this));
460 pending_messages_.clear(); 477 pending_messages_.clear();
461 request_index_ = 0; 478 request_index_ = 0;
462 } 479 }
OLDNEW
« no previous file with comments | « chrome/browser/media/media_stream_capture_indicator.h ('k') | chrome/browser/ui/views/tabs/base_tab.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698