| Index: ui/aura/window.h
|
| diff --git a/ui/aura/window.h b/ui/aura/window.h
|
| index 382d5821e0b437b98ccaeaffc7e47f6999c4e91c..3b87ef87647937a7d87a42b416b78233adbb9cf6 100644
|
| --- a/ui/aura/window.h
|
| +++ b/ui/aura/window.h
|
| @@ -335,6 +335,9 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
|
| // Type of a function to delete a property that this window owns.
|
| typedef void (*PropertyDeallocator)(intptr_t value);
|
|
|
| + // Overridden from ui::LayerDelegate:
|
| + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
|
| +
|
| private:
|
| friend class LayoutManager;
|
|
|
| @@ -395,7 +398,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
|
|
|
| // Overridden from ui::LayerDelegate:
|
| virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
|
| - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
|
|
|
| // Updates the layer name with a name based on the window's name and id.
|
| void UpdateLayerName(const std::string& name);
|
|
|