| OLD | NEW | 
|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_info_display/display_info_provide
     r.h" | 5 #include "chrome/browser/extensions/api/system_info_display/display_info_provide
     r.h" | 
| 6 | 6 | 
| 7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" | 
| 8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" | 
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" | 
| 10 #include "base/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" | 
| 11 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" | 
| 12 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" | 
| 13 #include "ui/gfx/display.h" | 13 #include "ui/gfx/display.h" | 
| 14 #include "ui/gfx/point.h" | 14 #include "ui/gfx/point.h" | 
| 15 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" | 
| 16 | 16 | 
| 17 using ash::internal::DisplayManager; | 17 using ash::internal::DisplayManager; | 
| 18 | 18 | 
| 19 namespace extensions { | 19 namespace extensions { | 
| 20 | 20 | 
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 440   int64 primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); | 440   int64 primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); | 
| 441   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) { | 441   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) { | 
| 442     AddInfoForDisplay(*display_manager->GetDisplayAt(i), display_manager, | 442     AddInfoForDisplay(*display_manager->GetDisplayAt(i), display_manager, | 
| 443                       primary_id, info); | 443                       primary_id, info); | 
| 444   } | 444   } | 
| 445 | 445 | 
| 446   return true; | 446   return true; | 
| 447 } | 447 } | 
| 448 | 448 | 
| 449 }  // namespace extensions | 449 }  // namespace extensions | 
| OLD | NEW | 
|---|