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

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

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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 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_chromeos.h" 5 #include "chrome/browser/extensions/display_info_provider_chromeos.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "ash/display/display_configuration_controller.h" 9 #include "ash/display/display_configuration_controller.h"
10 #include "ash/display/resolution_notification_controller.h" 10 #include "ash/display/resolution_notification_controller.h"
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 } 318 }
319 319
320 // Set the display mode. 320 // Set the display mode.
321 if (info.display_mode) { 321 if (info.display_mode) {
322 scoped_refptr<display::ManagedDisplayMode> current_mode = 322 scoped_refptr<display::ManagedDisplayMode> current_mode =
323 display_manager->GetActiveModeForDisplayId(id); 323 display_manager->GetActiveModeForDisplayId(id);
324 // Copy properties not set in the UI from the current mode. 324 // Copy properties not set in the UI from the current mode.
325 gfx::Size size(info.display_mode->width_in_native_pixels, 325 gfx::Size size(info.display_mode->width_in_native_pixels,
326 info.display_mode->height_in_native_pixels); 326 info.display_mode->height_in_native_pixels);
327 327
328 // NB: info.display_mode is neither an ash::DisplayMode or a 328 // NB: info.display_mode is neither a display::ManagedDisplayMode or a
329 // ui::DisplayMode. 329 // display::DisplayMode.
330 scoped_refptr<display::ManagedDisplayMode> new_mode( 330 scoped_refptr<display::ManagedDisplayMode> new_mode(
331 new display::ManagedDisplayMode( 331 new display::ManagedDisplayMode(
332 size, current_mode->refresh_rate(), current_mode->is_interlaced(), 332 size, current_mode->refresh_rate(), current_mode->is_interlaced(),
333 info.display_mode->is_native, info.display_mode->ui_scale, 333 info.display_mode->is_native, info.display_mode->ui_scale,
334 info.display_mode->device_scale_factor)); 334 info.display_mode->device_scale_factor));
335 335
336 if (new_mode->IsEquivalent(current_mode)) { 336 if (new_mode->IsEquivalent(current_mode)) {
337 *error = "Display mode matches current mode."; 337 *error = "Display mode matches current mode.";
338 return false; 338 return false;
339 } 339 }
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 touch_calibrator_.reset(new chromeos::TouchCalibratorController); 746 touch_calibrator_.reset(new chromeos::TouchCalibratorController);
747 return touch_calibrator_.get(); 747 return touch_calibrator_.get();
748 } 748 }
749 749
750 // static 750 // static
751 DisplayInfoProvider* DisplayInfoProvider::Create() { 751 DisplayInfoProvider* DisplayInfoProvider::Create() {
752 return new DisplayInfoProviderChromeOS(); 752 return new DisplayInfoProviderChromeOS();
753 } 753 }
754 754
755 } // namespace extensions 755 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/display/output_protection_delegate.cc ('k') | chrome/browser/media/output_protection_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698