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

Side by Side Diff: chrome/browser/extensions/display_info_provider_win.cc

Issue 476103002: Make DisplayInfoProvider an interface (Closed) Base URL: git@github.com:tmpsantos/chromium.git@display_info
Patch Set: Addressed review comments. Created 6 years, 4 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 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/extensions/api/system_display/display_info_provider.h" 5 #include "chrome/browser/extensions/display_info_provider_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include "base/hash.h" 9 #include "base/hash.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "base/win/win_util.h" 12 #include "base/win/win_util.h"
13 #include "chrome/common/extensions/api/system_display.h"
13 #include "ui/gfx/size.h" 14 #include "ui/gfx/size.h"
14 #include "ui/gfx/win/dpi.h" 15 #include "ui/gfx/win/dpi.h"
15 16
16 namespace extensions { 17 namespace extensions {
17 18
18 using api::system_display::DisplayUnitInfo; 19 using api::system_display::DisplayUnitInfo;
19 20
20 namespace { 21 namespace {
21 22
22 BOOL CALLBACK EnumMonitorCallback(HMONITOR monitor, 23 BOOL CALLBACK
23 HDC hdc, 24 EnumMonitorCallback(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM data) {
24 LPRECT rect,
25 LPARAM data) {
26 DisplayInfo* all_displays = reinterpret_cast<DisplayInfo*>(data); 25 DisplayInfo* all_displays = reinterpret_cast<DisplayInfo*>(data);
27 DCHECK(all_displays); 26 DCHECK(all_displays);
28 27
29 linked_ptr<DisplayUnitInfo> unit(new DisplayUnitInfo); 28 linked_ptr<DisplayUnitInfo> unit(new DisplayUnitInfo);
30 29
31 MONITORINFOEX monitor_info; 30 MONITORINFOEX monitor_info;
32 ZeroMemory(&monitor_info, sizeof(MONITORINFOEX)); 31 ZeroMemory(&monitor_info, sizeof(MONITORINFOEX));
33 monitor_info.cbSize = sizeof(monitor_info); 32 monitor_info.cbSize = sizeof(monitor_info);
34 GetMonitorInfo(monitor, &monitor_info); 33 GetMonitorInfo(monitor, &monitor_info);
35 34
36 DISPLAY_DEVICE device; 35 DISPLAY_DEVICE device;
37 device.cb = sizeof(device); 36 device.cb = sizeof(device);
38 if (!EnumDisplayDevices(monitor_info.szDevice, 0, &device, 0)) 37 if (!EnumDisplayDevices(monitor_info.szDevice, 0, &device, 0))
39 return FALSE; 38 return FALSE;
40 39
41 gfx::Size dpi(gfx::GetDPI()); 40 gfx::Size dpi(gfx::GetDPI());
42 unit->id = base::Int64ToString( 41 unit->id =
43 base::Hash(base::WideToUTF8(monitor_info.szDevice))); 42 base::Int64ToString(base::Hash(base::WideToUTF8(monitor_info.szDevice)));
44 unit->name = base::WideToUTF8(device.DeviceString); 43 unit->name = base::WideToUTF8(device.DeviceString);
45 unit->dpi_x = dpi.width(); 44 unit->dpi_x = dpi.width();
46 unit->dpi_y = dpi.height(); 45 unit->dpi_y = dpi.height();
47 all_displays->push_back(unit); 46 all_displays->push_back(unit);
48 47
49 return TRUE; 48 return TRUE;
50 } 49 }
51 50
52 } // namespace 51 } // namespace
53 52
54 bool DisplayInfoProvider::SetInfo(const std::string& display_id, 53 DisplayInfoProviderWin::DisplayInfoProviderWin() {
54 }
55
56 DisplayInfoProviderWin::~DisplayInfoProviderWin() {
57 }
58
59 bool DisplayInfoProviderWin::SetInfo(
60 const std::string& display_id,
55 const api::system_display::DisplayProperties& info, 61 const api::system_display::DisplayProperties& info,
56 std::string* error) { 62 std::string* error) {
57 *error = "Not implemented"; 63 *error = "Not implemented";
58 return false; 64 return false;
59 } 65 }
60 66
61 void DisplayInfoProvider::UpdateDisplayUnitInfoForPlatform( 67 void DisplayInfoProviderWin::UpdateDisplayUnitInfoForPlatform(
62 const gfx::Display& display, 68 const gfx::Display& display,
63 extensions::api::system_display::DisplayUnitInfo* unit) { 69 extensions::api::system_display::DisplayUnitInfo* unit) {
64 DisplayInfo all_displays; 70 DisplayInfo all_displays;
65 EnumDisplayMonitors(NULL, NULL, EnumMonitorCallback, 71 EnumDisplayMonitors(
66 reinterpret_cast<LPARAM>(&all_displays)); 72 NULL, NULL, EnumMonitorCallback, reinterpret_cast<LPARAM>(&all_displays));
67 for (size_t i = 0; i < all_displays.size(); ++i) { 73 for (size_t i = 0; i < all_displays.size(); ++i) {
68 if (unit->id == all_displays[i]->id) { 74 if (unit->id == all_displays[i]->id) {
69 unit->name = all_displays[i]->name; 75 unit->name = all_displays[i]->name;
70 unit->dpi_x = all_displays[i]->dpi_x; 76 unit->dpi_x = all_displays[i]->dpi_x;
71 unit->dpi_y = all_displays[i]->dpi_y; 77 unit->dpi_y = all_displays[i]->dpi_y;
72 break; 78 break;
73 } 79 }
74 } 80 }
75 } 81 }
76 82
83 // static
84 DisplayInfoProvider* DisplayInfoProvider::Create() {
85 return new DisplayInfoProviderWin();
86 }
87
77 } // namespace extensions 88 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698