Add stevenjb@ to display_info_provider OWNERS

Also added to BUILD.gn for CrOS changes.

Bug: none
Change-Id: I9cdc4a06246aecbb8b36546cc6c12b4c152f57dc
Reviewed-on: https://chromium-review.googlesource.com/1005501Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550228}

chrome/browser/extensions/BUILD.gn

@@ -513,12 +513,6 @@ static_library("extensions") {
     "device_permissions_dialog_controller.h",
     "devtools_util.cc",
     "devtools_util.h",
-    "display_info_provider_chromeos.cc",
-    "display_info_provider_chromeos.h",
-    "display_info_provider_mac.cc",
-    "display_info_provider_mac.h",
-    "display_info_provider_win.cc",
-    "display_info_provider_win.h",
     "error_console/error_console.cc",
     "error_console/error_console.h",
     "error_console/error_console_factory.cc",
@@ -711,6 +705,12 @@ static_library("extensions") {
     "suspicious_extension_bubble_delegate.h",
     "sync_bundle.cc",
     "sync_bundle.h",
+    "system_display/display_info_provider_chromeos.cc",
+    "system_display/display_info_provider_chromeos.h",
+    "system_display/display_info_provider_mac.cc",
+    "system_display/display_info_provider_mac.h",
+    "system_display/display_info_provider_win.cc",
+    "system_display/display_info_provider_win.h",
     "tab_helper.cc",
     "tab_helper.h",
     "theme_installed_infobar_delegate.cc",
@@ -1089,8 +1089,8 @@ static_library("extensions") {
     ]
   } else if (use_aura && !is_chromeos) {
     sources += [
-      "display_info_provider_aura.cc",
-      "display_info_provider_aura.h",
+      "system_display/display_info_provider_aura.cc",
+      "system_display/display_info_provider_aura.h",
     ]
   }
 

chrome/browser/extensions/OWNERS

@@ -7,6 +7,7 @@ per-file bookmark_app_*=mgiuca@chromium.org
 per-file bookmark_app_*=ortuno@chromium.org
 
 # For adding/renaming files for Chrome OS apps APIs.
+per-file BUILD.gn=stevenjb@chromium.org
 per-file BUILD.gn=tbarzic@chromium.org
 
 # COMPONENT: Platform>Extensions

chrome/browser/extensions/system_display/OWNERS

+stevenjb@chromium.org

chrome/browser/extensions/display_info_provider_aura.cc → chrome/browser/extensions/system_display/display_info_provider_aura.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/display_info_provider_aura.h"
+#include "chrome/browser/extensions/system_display/display_info_provider_aura.h"
 
 namespace extensions {
 

chrome/browser/extensions/display_info_provider_aura.h → chrome/browser/extensions/system_display/display_info_provider_aura.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_AURA_H_
-#define CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_AURA_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_AURA_H_
+#define CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_AURA_H_
 
 #include "base/macros.h"
 #include "extensions/browser/api/system_display/display_info_provider.h"
@@ -20,4 +20,4 @@ class DisplayInfoProviderAura : public DisplayInfoProvider {
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_AURA_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_AURA_H_

chrome/browser/extensions/display_info_provider_chromeos.cc → chrome/browser/extensions/system_display/display_info_provider_chromeos.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/display_info_provider_chromeos.h"
+#include "chrome/browser/extensions/system_display/display_info_provider_chromeos.h"
 
 #include <stdint.h>
 #include <cmath>

chrome/browser/extensions/display_info_provider_chromeos.h → chrome/browser/extensions/system_display/display_info_provider_chromeos.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_CHROMEOS_H_
-#define CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_CHROMEOS_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_CHROMEOS_H_
+#define CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_CHROMEOS_H_
 
 #include <map>
 #include <memory>
@@ -75,4 +75,4 @@ class DisplayInfoProviderChromeOS : public DisplayInfoProvider {
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_CHROMEOS_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_CHROMEOS_H_

chrome/browser/extensions/display_info_provider_chromeos_unittest.cc → chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc

@@ -17,7 +17,7 @@
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/extensions/display_info_provider_chromeos.h"
+#include "chrome/browser/extensions/system_display/display_info_provider_chromeos.h"
 #include "chrome/browser/ui/ash/tablet_mode_client.h"
 #include "extensions/common/api/system_display.h"
 #include "services/ui/public/cpp/input_devices/input_device_client_test_api.h"

chrome/browser/extensions/display_info_provider_mac.cc → chrome/browser/extensions/system_display/display_info_provider_mac.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/display_info_provider_mac.h"
+#include "chrome/browser/extensions/system_display/display_info_provider_mac.h"
 
 #include "base/logging.h"
 

chrome/browser/extensions/display_info_provider_mac.h → chrome/browser/extensions/system_display/display_info_provider_mac.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_MAC_H_
-#define CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_MAC_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_MAC_H_
+#define CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_MAC_H_
 
 #include "base/macros.h"
 #include "extensions/browser/api/system_display/display_info_provider.h"
@@ -25,4 +25,4 @@ class DisplayInfoProviderMac : public DisplayInfoProvider {
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_MAC_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_MAC_H_

chrome/browser/extensions/display_info_provider_win.cc → chrome/browser/extensions/system_display/display_info_provider_win.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/display_info_provider_win.h"
+#include "chrome/browser/extensions/system_display/display_info_provider_win.h"
 
-#include <windows.h>
 #include <stddef.h>
+#include <windows.h>
 
 #include "base/hash.h"
 #include "base/strings/string_number_conversions.h"
@@ -22,8 +22,10 @@ using api::system_display::DisplayUnitInfo;
 
 namespace {
 
-BOOL CALLBACK
-EnumMonitorCallback(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM data) {
+BOOL CALLBACK EnumMonitorCallback(HMONITOR monitor,
+                                  HDC hdc,
+                                  LPRECT rect,
+                                  LPARAM data) {
   DisplayInfoProvider::DisplayUnitInfoList* all_displays =
       reinterpret_cast<DisplayInfoProvider::DisplayUnitInfoList*>(data);
   DCHECK(all_displays);
@@ -56,8 +58,8 @@ void DisplayInfoProviderWin::UpdateDisplayUnitInfoForPlatform(
     const display::Display& display,
     extensions::api::system_display::DisplayUnitInfo* unit) {
   DisplayUnitInfoList all_displays;
-  EnumDisplayMonitors(
-      NULL, NULL, EnumMonitorCallback, reinterpret_cast<LPARAM>(&all_displays));
+  EnumDisplayMonitors(NULL, NULL, EnumMonitorCallback,
+                      reinterpret_cast<LPARAM>(&all_displays));
   for (size_t i = 0; i < all_displays.size(); ++i) {
     if (unit->id == all_displays[i].id) {
       unit->name = all_displays[i].name;

chrome/browser/extensions/display_info_provider_win.h → chrome/browser/extensions/system_display/display_info_provider_win.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_WIN_H_
-#define CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_WIN_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_WIN_H_
+#define CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_WIN_H_
 
 #include "base/macros.h"
 #include "extensions/browser/api/system_display/display_info_provider.h"
@@ -25,4 +25,4 @@ class DisplayInfoProviderWin : public DisplayInfoProvider {
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_WIN_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_WIN_H_

chrome/test/BUILD.gn

@@ -3365,7 +3365,6 @@ test("unit_tests") {
       "../browser/extensions/convert_user_script_unittest.cc",
       "../browser/extensions/convert_web_app_unittest.cc",
       "../browser/extensions/default_apps_unittest.cc",
-      "../browser/extensions/display_info_provider_chromeos_unittest.cc",
       "../browser/extensions/error_console/error_console_unittest.cc",
       "../browser/extensions/event_router_forwarder_unittest.cc",
       "../browser/extensions/extension_action_icon_factory_unittest.cc",
@@ -3424,6 +3423,7 @@ test("unit_tests") {
       "../browser/extensions/scripting_permissions_modifier_unittest.cc",
       "../browser/extensions/shared_module_service_unittest.cc",
       "../browser/extensions/standard_management_policy_provider_unittest.cc",
+      "../browser/extensions/system_display/display_info_provider_chromeos_unittest.cc",
       "../browser/extensions/tab_helper_unittest.cc",
       "../browser/extensions/update_install_gate_unittest.cc",
       "../browser/extensions/updater/extension_cache_fake.cc",