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

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

Issue 581023003: [SystemDisplayAPI] Observe display change on linux/win/mac as well (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 3 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/extensions/display_info_provider_mac.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/display_info_provider_win.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 "extensions/common/api/system_display.h" 13 #include "extensions/common/api/system_display.h"
14 #include "ui/gfx/screen.h"
14 #include "ui/gfx/size.h" 15 #include "ui/gfx/size.h"
15 #include "ui/gfx/win/dpi.h" 16 #include "ui/gfx/win/dpi.h"
16 17
17 namespace extensions { 18 namespace extensions {
18 19
19 using core_api::system_display::DisplayUnitInfo; 20 using core_api::system_display::DisplayUnitInfo;
20 21
21 namespace { 22 namespace {
22 23
23 BOOL CALLBACK 24 BOOL CALLBACK
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 if (unit->id == all_displays[i]->id) { 75 if (unit->id == all_displays[i]->id) {
75 unit->name = all_displays[i]->name; 76 unit->name = all_displays[i]->name;
76 unit->dpi_x = all_displays[i]->dpi_x; 77 unit->dpi_x = all_displays[i]->dpi_x;
77 unit->dpi_y = all_displays[i]->dpi_y; 78 unit->dpi_y = all_displays[i]->dpi_y;
78 break; 79 break;
79 } 80 }
80 } 81 }
81 } 82 }
82 83
83 gfx::Screen* DisplayInfoProviderWin::GetActiveScreen() { 84 gfx::Screen* DisplayInfoProviderWin::GetActiveScreen() {
84 return NULL; 85 // TODO(scottmg): native screen is wrong http://crbug.com/133312
86 return gfx::Screen::GetNativeScreen();
85 } 87 }
86 88
87 // static 89 // static
88 DisplayInfoProvider* DisplayInfoProvider::Create() { 90 DisplayInfoProvider* DisplayInfoProvider::Create() {
89 return new DisplayInfoProviderWin(); 91 return new DisplayInfoProviderWin();
90 } 92 }
91 93
92 } // namespace extensions 94 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/display_info_provider_mac.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698