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

Side by Side Diff: ui/display/chromeos/apply_content_protection_task.cc

Issue 1456623002: Add support for virtual displays (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use std::max as suggested by oshima@ Created 5 years 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
« no previous file with comments | « ui/display/DEPS ('k') | ui/display/chromeos/configure_displays_task.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ui/display/chromeos/apply_content_protection_task.h" 5 #include "ui/display/chromeos/apply_content_protection_task.h"
6 6
7 #include "ui/display/chromeos/display_layout_manager.h" 7 #include "ui/display/chromeos/display_layout_manager.h"
8 #include "ui/display/types/display_snapshot.h" 8 #include "ui/display/types/display_snapshot.h"
9 #include "ui/display/types/native_display_delegate.h" 9 #include "ui/display/types/native_display_delegate.h"
10 10
(...skipping 10 matching lines...) Expand all
21 return false; 21 return false;
22 // DisplayPort, DVI, and HDMI all support HDCP. 22 // DisplayPort, DVI, and HDMI all support HDCP.
23 case DISPLAY_CONNECTION_TYPE_DISPLAYPORT: 23 case DISPLAY_CONNECTION_TYPE_DISPLAYPORT:
24 case DISPLAY_CONNECTION_TYPE_DVI: 24 case DISPLAY_CONNECTION_TYPE_DVI:
25 case DISPLAY_CONNECTION_TYPE_HDMI: 25 case DISPLAY_CONNECTION_TYPE_HDMI:
26 hdcp_capable_displays->push_back(display); 26 hdcp_capable_displays->push_back(display);
27 break; 27 break;
28 case DISPLAY_CONNECTION_TYPE_INTERNAL: 28 case DISPLAY_CONNECTION_TYPE_INTERNAL:
29 case DISPLAY_CONNECTION_TYPE_VGA: 29 case DISPLAY_CONNECTION_TYPE_VGA:
30 case DISPLAY_CONNECTION_TYPE_NETWORK: 30 case DISPLAY_CONNECTION_TYPE_NETWORK:
31 case DISPLAY_CONNECTION_TYPE_VIRTUAL:
31 // No protections for these types. Do nothing. 32 // No protections for these types. Do nothing.
32 break; 33 break;
33 case DISPLAY_CONNECTION_TYPE_NONE: 34 case DISPLAY_CONNECTION_TYPE_NONE:
34 NOTREACHED(); 35 NOTREACHED();
35 break; 36 break;
36 } 37 }
37 } 38 }
38 39
39 return true; 40 return true;
40 } 41 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 } else { 164 } else {
164 auto it = requests_.find(display_id); 165 auto it = requests_.find(display_id);
165 if (it != requests_.end()) 166 if (it != requests_.end())
166 desired_mask = it->second; 167 desired_mask = it->second;
167 } 168 }
168 169
169 return desired_mask; 170 return desired_mask;
170 } 171 }
171 172
172 } // namespace ui 173 } // namespace ui
OLDNEW
« no previous file with comments | « ui/display/DEPS ('k') | ui/display/chromeos/configure_displays_task.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698