| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ash/media_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/media_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include "ash/common/system/tray/system_tray_notifier.h" |
| 8 #include "ash/common/wm_shell.h" |
| 7 #include "ash/content/shell_content_state.h" | 9 #include "ash/content/shell_content_state.h" |
| 8 #include "ash/shell.h" | |
| 9 #include "ash/system/tray/system_tray_notifier.h" | |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| 11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
| 13 #include "chrome/browser/chromeos/extensions/media_player_api.h" | 13 #include "chrome/browser/chromeos/extensions/media_player_api.h" |
| 14 #include "chrome/browser/chromeos/extensions/media_player_event_router.h" | 14 #include "chrome/browser/chromeos/extensions/media_player_event_router.h" |
| 15 #include "chrome/browser/media/media_stream_capture_indicator.h" | 15 #include "chrome/browser/media/media_stream_capture_indicator.h" |
| 16 #include "chrome/browser/profiles/profile_manager.h" | 16 #include "chrome/browser/profiles/profile_manager.h" |
| 17 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
| 18 #include "chrome/browser/ui/browser_list.h" | 18 #include "chrome/browser/ui/browser_list.h" |
| 19 #include "chrome/browser/ui/browser_window.h" | 19 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 int render_process_id, | 155 int render_process_id, |
| 156 int render_frame_id, | 156 int render_frame_id, |
| 157 content::MediaStreamType stream_type, | 157 content::MediaStreamType stream_type, |
| 158 const content::MediaRequestState state) { | 158 const content::MediaRequestState state) { |
| 159 base::MessageLoopForUI::current()->task_runner()->PostTask( | 159 base::MessageLoopForUI::current()->task_runner()->PostTask( |
| 160 FROM_HERE, base::Bind(&MediaDelegateChromeOS::NotifyMediaCaptureChange, | 160 FROM_HERE, base::Bind(&MediaDelegateChromeOS::NotifyMediaCaptureChange, |
| 161 weak_ptr_factory_.GetWeakPtr())); | 161 weak_ptr_factory_.GetWeakPtr())); |
| 162 } | 162 } |
| 163 | 163 |
| 164 void MediaDelegateChromeOS::NotifyMediaCaptureChange() { | 164 void MediaDelegateChromeOS::NotifyMediaCaptureChange() { |
| 165 ash::Shell::GetInstance() | 165 ash::WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); |
| 166 ->system_tray_notifier() | |
| 167 ->NotifyMediaCaptureChanged(); | |
| 168 } | 166 } |
| OLD | NEW |