OLD | NEW |
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 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include "base/hash.h" | 10 #include "base/hash.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 if (unit->id == all_displays[i]->id) { | 76 if (unit->id == all_displays[i]->id) { |
77 unit->name = all_displays[i]->name; | 77 unit->name = all_displays[i]->name; |
78 unit->dpi_x = all_displays[i]->dpi_x; | 78 unit->dpi_x = all_displays[i]->dpi_x; |
79 unit->dpi_y = all_displays[i]->dpi_y; | 79 unit->dpi_y = all_displays[i]->dpi_y; |
80 break; | 80 break; |
81 } | 81 } |
82 } | 82 } |
83 } | 83 } |
84 | 84 |
85 gfx::Screen* DisplayInfoProviderWin::GetActiveScreen() { | 85 gfx::Screen* DisplayInfoProviderWin::GetActiveScreen() { |
86 // TODO(scottmg): native screen is wrong http://crbug.com/133312 | 86 return gfx::Screen::GetScreen(); |
87 return gfx::Screen::GetNativeScreen(); | |
88 } | 87 } |
89 | 88 |
90 // static | 89 // static |
91 DisplayInfoProvider* DisplayInfoProvider::Create() { | 90 DisplayInfoProvider* DisplayInfoProvider::Create() { |
92 return new DisplayInfoProviderWin(); | 91 return new DisplayInfoProviderWin(); |
93 } | 92 } |
94 | 93 |
95 } // namespace extensions | 94 } // namespace extensions |
OLD | NEW |