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

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 10168008: Show camera and microphone status indicators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed Tommi's comments. Created 8 years, 7 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/browser_process_impl.h" 5 #include "chrome/browser/browser_process_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/debugger/remote_debugging_server.h" 27 #include "chrome/browser/debugger/remote_debugging_server.h"
28 #include "chrome/browser/download/download_request_limiter.h" 28 #include "chrome/browser/download/download_request_limiter.h"
29 #include "chrome/browser/download/download_status_updater.h" 29 #include "chrome/browser/download/download_status_updater.h"
30 #include "chrome/browser/extensions/extension_event_router_forwarder.h" 30 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
31 #include "chrome/browser/extensions/extension_tab_id_map.h" 31 #include "chrome/browser/extensions/extension_tab_id_map.h"
32 #include "chrome/browser/first_run/upgrade_util.h" 32 #include "chrome/browser/first_run/upgrade_util.h"
33 #include "chrome/browser/google/google_url_tracker.h" 33 #include "chrome/browser/google/google_url_tracker.h"
34 #include "chrome/browser/icon_manager.h" 34 #include "chrome/browser/icon_manager.h"
35 #include "chrome/browser/intranet_redirect_detector.h" 35 #include "chrome/browser/intranet_redirect_detector.h"
36 #include "chrome/browser/io_thread.h" 36 #include "chrome/browser/io_thread.h"
37 #include "chrome/browser/media/media_stream_capture_indicator.h"
37 #include "chrome/browser/metrics/metrics_service.h" 38 #include "chrome/browser/metrics/metrics_service.h"
38 #include "chrome/browser/metrics/thread_watcher.h" 39 #include "chrome/browser/metrics/thread_watcher.h"
39 #include "chrome/browser/net/chrome_net_log.h" 40 #include "chrome/browser/net/chrome_net_log.h"
40 #include "chrome/browser/net/crl_set_fetcher.h" 41 #include "chrome/browser/net/crl_set_fetcher.h"
41 #include "chrome/browser/net/sdch_dictionary_fetcher.h" 42 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
42 #include "chrome/browser/notifications/notification_ui_manager.h" 43 #include "chrome/browser/notifications/notification_ui_manager.h"
43 #include "chrome/browser/policy/browser_policy_connector.h" 44 #include "chrome/browser/policy/browser_policy_connector.h"
44 #include "chrome/browser/policy/policy_service_impl.h" 45 #include "chrome/browser/policy/policy_service_impl.h"
45 #include "chrome/browser/policy/policy_service_stub.h" 46 #include "chrome/browser/policy/policy_service_stub.h"
46 #include "chrome/browser/prefs/browser_prefs.h" 47 #include "chrome/browser/prefs/browser_prefs.h"
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 return tab_closeable_state_watcher_.get(); 551 return tab_closeable_state_watcher_.get();
551 } 552 }
552 553
553 BackgroundModeManager* BrowserProcessImpl::background_mode_manager() { 554 BackgroundModeManager* BrowserProcessImpl::background_mode_manager() {
554 DCHECK(CalledOnValidThread()); 555 DCHECK(CalledOnValidThread());
555 if (!background_mode_manager_.get()) 556 if (!background_mode_manager_.get())
556 CreateBackgroundModeManager(); 557 CreateBackgroundModeManager();
557 return background_mode_manager_.get(); 558 return background_mode_manager_.get();
558 } 559 }
559 560
561 MediaStreamCaptureIndicator*
562 BrowserProcessImpl::media_stream_capture_indicator() {
MAD 2012/04/25 15:34:53 The coding style wants the name of the function on
Nico 2012/04/25 15:52:51 line 584 (20 lines below) has returntype Browse
no longer working on chromium 2012/04/30 09:59:38 Thanks Nico for addressing this, it looks like ret
no longer working on chromium 2012/04/30 09:59:38 Done.
563 DCHECK(CalledOnValidThread());
564 if (!media_stream_capture_indicator_.get())
565 media_stream_capture_indicator_.reset(new MediaStreamCaptureIndicator());
566 return media_stream_capture_indicator_.get();
567 }
568
560 StatusTray* BrowserProcessImpl::status_tray() { 569 StatusTray* BrowserProcessImpl::status_tray() {
561 DCHECK(CalledOnValidThread()); 570 DCHECK(CalledOnValidThread());
562 if (!status_tray_.get()) 571 if (!status_tray_.get())
563 CreateStatusTray(); 572 CreateStatusTray();
564 return status_tray_.get(); 573 return status_tray_.get();
565 } 574 }
566 575
567 576
568 SafeBrowsingService* BrowserProcessImpl::safe_browsing_service() { 577 SafeBrowsingService* BrowserProcessImpl::safe_browsing_service() {
569 DCHECK(CalledOnValidThread()); 578 DCHECK(CalledOnValidThread());
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 } 924 }
916 925
917 void BrowserProcessImpl::OnAutoupdateTimer() { 926 void BrowserProcessImpl::OnAutoupdateTimer() {
918 if (CanAutorestartForUpdate()) { 927 if (CanAutorestartForUpdate()) {
919 DLOG(WARNING) << "Detected update. Restarting browser."; 928 DLOG(WARNING) << "Detected update. Restarting browser.";
920 RestartBackgroundInstance(); 929 RestartBackgroundInstance();
921 } 930 }
922 } 931 }
923 932
924 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 933 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698