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

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

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/output_protection_proxy.h" 5 #include "chrome/browser/media/output_protection_proxy.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" 8 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
9 #include "content/public/browser/render_frame_host.h" 9 #include "content/public/browser/render_frame_host.h"
10 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 } 72 }
73 73
74 uint32_t new_link_mask = link_mask; 74 uint32_t new_link_mask = link_mask;
75 // If we successfully retrieved the device level status, check for capturers. 75 // If we successfully retrieved the device level status, check for capturers.
76 if (success) { 76 if (success) {
77 const bool is_insecure_capture_detected = 77 const bool is_insecure_capture_detected =
78 MediaCaptureDevicesDispatcher::GetInstance() 78 MediaCaptureDevicesDispatcher::GetInstance()
79 ->IsInsecureCapturingInProgress(render_process_id_, 79 ->IsInsecureCapturingInProgress(render_process_id_,
80 render_frame_id_); 80 render_frame_id_);
81 if (is_insecure_capture_detected) 81 if (is_insecure_capture_detected)
82 new_link_mask |= ui::DISPLAY_CONNECTION_TYPE_NETWORK; 82 new_link_mask |= display::DISPLAY_CONNECTION_TYPE_NETWORK;
83 } 83 }
84 84
85 callback.Run(success, new_link_mask, protection_mask); 85 callback.Run(success, new_link_mask, protection_mask);
86 } 86 }
87 87
88 } // namespace chrome 88 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698