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

Side by Side Diff: ui/display/chromeos/query_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
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/query_content_protection_task.h" 5 #include "ui/display/chromeos/query_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 29 matching lines...) Expand all
40 callback_.Run(response_); 40 callback_.Run(response_);
41 return; 41 return;
42 case DISPLAY_CONNECTION_TYPE_DISPLAYPORT: 42 case DISPLAY_CONNECTION_TYPE_DISPLAYPORT:
43 case DISPLAY_CONNECTION_TYPE_DVI: 43 case DISPLAY_CONNECTION_TYPE_DVI:
44 case DISPLAY_CONNECTION_TYPE_HDMI: 44 case DISPLAY_CONNECTION_TYPE_HDMI:
45 hdcp_capable_displays.push_back(display); 45 hdcp_capable_displays.push_back(display);
46 break; 46 break;
47 case DISPLAY_CONNECTION_TYPE_INTERNAL: 47 case DISPLAY_CONNECTION_TYPE_INTERNAL:
48 case DISPLAY_CONNECTION_TYPE_VGA: 48 case DISPLAY_CONNECTION_TYPE_VGA:
49 case DISPLAY_CONNECTION_TYPE_NETWORK: 49 case DISPLAY_CONNECTION_TYPE_NETWORK:
50 case DISPLAY_CONNECTION_TYPE_VIRTUAL:
50 // No protections for these types. Do nothing. 51 // No protections for these types. Do nothing.
51 break; 52 break;
52 case DISPLAY_CONNECTION_TYPE_NONE: 53 case DISPLAY_CONNECTION_TYPE_NONE:
53 NOTREACHED(); 54 NOTREACHED();
54 break; 55 break;
55 } 56 }
56 } 57 }
57 58
58 response_.success = true; 59 response_.success = true;
59 pending_requests_ = hdcp_capable_displays.size(); 60 pending_requests_ = hdcp_capable_displays.size();
(...skipping 18 matching lines...) Expand all
78 79
79 pending_requests_--; 80 pending_requests_--;
80 // Wait for all the requests to finish before invoking the callback. 81 // Wait for all the requests to finish before invoking the callback.
81 if (pending_requests_ != 0) 82 if (pending_requests_ != 0)
82 return; 83 return;
83 84
84 callback_.Run(response_); 85 callback_.Run(response_);
85 } 86 }
86 87
87 } // namespace ui 88 } // namespace ui
OLDNEW
« no previous file with comments | « ui/display/chromeos/display_util.cc ('k') | ui/display/chromeos/update_display_configuration_task.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698