| 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 "ash/utility/screenshot_controller.h" | 5 #include "ash/utility/screenshot_controller.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #include "ash/common/shell_window_ids.h" | 9 #include "ash/common/shell_window_ids.h" |
| 10 #include "ash/display/mouse_cursor_event_filter.h" | 10 #include "ash/display/mouse_cursor_event_filter.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 DISALLOW_COPY_AND_ASSIGN(ScreenshotWindowTargeter); | 81 DISALLOW_COPY_AND_ASSIGN(ScreenshotWindowTargeter); |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 } // namespace | 84 } // namespace |
| 85 | 85 |
| 86 class ScreenshotController::ScreenshotLayer : public ui::LayerOwner, | 86 class ScreenshotController::ScreenshotLayer : public ui::LayerOwner, |
| 87 public ui::LayerDelegate { | 87 public ui::LayerDelegate { |
| 88 public: | 88 public: |
| 89 ScreenshotLayer(ui::Layer* parent, bool immediate_overlay) | 89 ScreenshotLayer(ui::Layer* parent, bool immediate_overlay) |
| 90 : draw_inactive_overlay_(immediate_overlay) { | 90 : draw_inactive_overlay_(immediate_overlay) { |
| 91 SetLayer(new ui::Layer(ui::LAYER_TEXTURED)); | 91 SetLayer(base::MakeUnique<ui::Layer>(ui::LAYER_TEXTURED)); |
| 92 layer()->SetFillsBoundsOpaquely(false); | 92 layer()->SetFillsBoundsOpaquely(false); |
| 93 layer()->SetBounds(parent->bounds()); | 93 layer()->SetBounds(parent->bounds()); |
| 94 parent->Add(layer()); | 94 parent->Add(layer()); |
| 95 parent->StackAtTop(layer()); | 95 parent->StackAtTop(layer()); |
| 96 layer()->SetVisible(true); | 96 layer()->SetVisible(true); |
| 97 layer()->set_delegate(this); | 97 layer()->set_delegate(this); |
| 98 } | 98 } |
| 99 ~ScreenshotLayer() override {} | 99 ~ScreenshotLayer() override {} |
| 100 | 100 |
| 101 const gfx::Rect& region() const { return region_; } | 101 const gfx::Rect& region() const { return region_; } |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 | 542 |
| 543 void ScreenshotController::OnDisplayMetricsChanged( | 543 void ScreenshotController::OnDisplayMetricsChanged( |
| 544 const display::Display& display, | 544 const display::Display& display, |
| 545 uint32_t changed_metrics) {} | 545 uint32_t changed_metrics) {} |
| 546 | 546 |
| 547 void ScreenshotController::OnWindowDestroying(aura::Window* window) { | 547 void ScreenshotController::OnWindowDestroying(aura::Window* window) { |
| 548 SetSelectedWindow(nullptr); | 548 SetSelectedWindow(nullptr); |
| 549 } | 549 } |
| 550 | 550 |
| 551 } // namespace ash | 551 } // namespace ash |
| OLD | NEW |