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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc

Issue 815363002: replace COMPILE_ASSERT with static_assert in chrome/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 5 years, 12 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
« no previous file with comments | « chrome/browser/profile_resetter/resettable_settings_snapshot.cc ('k') | chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/renderer_host/pepper/pepper_output_protection_message_f ilter.h" 5 #include "chrome/browser/renderer_host/pepper/pepper_output_protection_message_f ilter.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 8 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
9 #include "content/public/browser/browser_ppapi_host.h" 9 #include "content/public/browser/browser_ppapi_host.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
(...skipping 12 matching lines...) Expand all
23 #include "ui/aura/window.h" 23 #include "ui/aura/window.h"
24 #include "ui/display/chromeos/display_configurator.h" 24 #include "ui/display/chromeos/display_configurator.h"
25 #include "ui/gfx/screen.h" 25 #include "ui/gfx/screen.h"
26 #endif 26 #endif
27 27
28 namespace chrome { 28 namespace chrome {
29 29
30 namespace { 30 namespace {
31 31
32 #if defined(OS_CHROMEOS) 32 #if defined(OS_CHROMEOS)
33 COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NONE) == 33 static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NONE) ==
34 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_NONE), 34 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_NONE),
35 PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NONE); 35 "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NONE value mismatch");
36 COMPILE_ASSERT( 36 static_assert(
37 static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_UNKNOWN) == 37 static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_UNKNOWN) ==
38 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_UNKNOWN), 38 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_UNKNOWN),
39 PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_UNKNOWN); 39 "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_UNKNOWN value mismatch");
40 COMPILE_ASSERT( 40 static_assert(
41 static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_INTERNAL) == 41 static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_INTERNAL) ==
42 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_INTERNAL), 42 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_INTERNAL),
43 PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_INTERNAL); 43 "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_INTERNAL value mismatch");
44 COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_VGA) == 44 static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_VGA) ==
45 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_VGA), 45 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_VGA),
46 PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_VGA); 46 "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_VGA value mismatch");
47 COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_HDMI) == 47 static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_HDMI) ==
48 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_HDMI), 48 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_HDMI),
49 PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_HDMI); 49 "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_HDMI value mismatch");
50 COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DVI) == 50 static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DVI) ==
51 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_DVI), 51 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_DVI),
52 PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DVI); 52 "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DVI value mismatch");
53 COMPILE_ASSERT( 53 static_assert(
54 static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DISPLAYPORT) == 54 static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DISPLAYPORT) ==
55 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_DISPLAYPORT), 55 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_DISPLAYPORT),
56 PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DISPLAYPORT); 56 "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_DISPLAYPORT value mismatch");
57 COMPILE_ASSERT( 57 static_assert(
58 static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NETWORK) == 58 static_cast<int>(PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NETWORK) ==
59 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_NETWORK), 59 static_cast<int>(ui::DISPLAY_CONNECTION_TYPE_NETWORK),
60 PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NETWORK); 60 "PP_OUTPUT_PROTECTION_LINK_TYPE_PRIVATE_NETWORK value mismatch");
61 COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_METHOD_PRIVATE_NONE) == 61 static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_METHOD_PRIVATE_NONE) ==
62 static_cast<int>(ui::CONTENT_PROTECTION_METHOD_NONE), 62 static_cast<int>(ui::CONTENT_PROTECTION_METHOD_NONE),
63 PP_OUTPUT_PROTECTION_METHOD_PRIVATE_NONE); 63 "PP_OUTPUT_PROTECTION_METHOD_PRIVATE_NONE value mismatch");
64 COMPILE_ASSERT(static_cast<int>(PP_OUTPUT_PROTECTION_METHOD_PRIVATE_HDCP) == 64 static_assert(static_cast<int>(PP_OUTPUT_PROTECTION_METHOD_PRIVATE_HDCP) ==
65 static_cast<int>(ui::CONTENT_PROTECTION_METHOD_HDCP), 65 static_cast<int>(ui::CONTENT_PROTECTION_METHOD_HDCP),
66 PP_OUTPUT_PROTECTION_METHOD_PRIVATE_HDCP); 66 "PP_OUTPUT_PROTECTION_METHOD_PRIVATE_HDCP value mismatch");
67 67
68 bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64* display_id) { 68 bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64* display_id) {
69 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 69 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
70 gfx::NativeView native_view = rfh->GetNativeView(); 70 gfx::NativeView native_view = rfh->GetNativeView();
71 gfx::Screen* screen = gfx::Screen::GetScreenFor(native_view); 71 gfx::Screen* screen = gfx::Screen::GetScreenFor(native_view);
72 if (!screen) 72 if (!screen)
73 return false; 73 return false;
74 gfx::Display display = screen->GetDisplayNearestWindow(native_view); 74 gfx::Display display = screen->GetDisplayNearestWindow(native_view);
75 *display_id = display.id(); 75 *display_id = display.id();
76 return true; 76 return true;
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 SendReply(reply_context, 315 SendReply(reply_context,
316 PpapiPluginMsg_OutputProtection_EnableProtectionReply()); 316 PpapiPluginMsg_OutputProtection_EnableProtectionReply());
317 return PP_OK_COMPLETIONPENDING; 317 return PP_OK_COMPLETIONPENDING;
318 #else 318 #else
319 NOTIMPLEMENTED(); 319 NOTIMPLEMENTED();
320 return PP_ERROR_NOTSUPPORTED; 320 return PP_ERROR_NOTSUPPORTED;
321 #endif 321 #endif
322 } 322 }
323 323
324 } // namespace chrome 324 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/profile_resetter/resettable_settings_snapshot.cc ('k') | chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698