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

Side by Side Diff: ash/common/wm/window_cycle_list.cc

Issue 2637383003: Change Painter factory functions to unique_ptr (Closed)
Patch Set: msw review 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
« no previous file with comments | « no previous file | ash/common/wm/workspace/phantom_window_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/common/wm/window_cycle_list.h" 5 #include "ash/common/wm/window_cycle_list.h"
6 6
7 #include <list> 7 #include <list>
8 #include <map> 8 #include <map>
9 9
10 #include "ash/common/wm/mru_window_tracker.h" 10 #include "ash/common/wm/mru_window_tracker.h"
11 #include "ash/common/wm/window_state.h" 11 #include "ash/common/wm/window_state.h"
12 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
13 #include "ash/common/wm_window.h" 13 #include "ash/common/wm_window.h"
14 #include "ash/public/cpp/shell_window_ids.h" 14 #include "ash/public/cpp/shell_window_ids.h"
15 #include "ash/root_window_controller.h" 15 #include "ash/root_window_controller.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/memory/ptr_util.h"
18 #include "ui/accessibility/ax_node_data.h" 17 #include "ui/accessibility/ax_node_data.h"
19 #include "ui/compositor/scoped_layer_animation_settings.h" 18 #include "ui/compositor/scoped_layer_animation_settings.h"
20 #include "ui/display/display.h" 19 #include "ui/display/display.h"
21 #include "ui/display/screen.h" 20 #include "ui/display/screen.h"
22 #include "ui/gfx/canvas.h" 21 #include "ui/gfx/canvas.h"
23 #include "ui/views/background.h" 22 #include "ui/views/background.h"
24 #include "ui/views/border.h" 23 #include "ui/views/border.h"
25 #include "ui/views/controls/label.h" 24 #include "ui/views/controls/label.h"
26 #include "ui/views/layout/box_layout.h" 25 #include "ui/views/layout/box_layout.h"
27 #include "ui/views/painter.h" 26 #include "ui/views/painter.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 // |mirror_container_| owns |view|. 239 // |mirror_container_| owns |view|.
241 views::View* view = new WindowPreviewView(window); 240 views::View* view = new WindowPreviewView(window);
242 window_view_map_[window] = view; 241 window_view_map_[window] = view;
243 mirror_container_->AddChildView(view); 242 mirror_container_->AddChildView(view);
244 } 243 }
245 244
246 // The background needs to be painted to fill the layer, not the View, 245 // The background needs to be painted to fill the layer, not the View,
247 // because the layer animates bounds changes but the View's bounds change 246 // because the layer animates bounds changes but the View's bounds change
248 // immediately. 247 // immediately.
249 highlight_view_->set_background(new LayerFillBackgroundPainter( 248 highlight_view_->set_background(new LayerFillBackgroundPainter(
250 base::WrapUnique(views::Painter::CreateRoundRectWith1PxBorderPainter( 249 views::Painter::CreateRoundRectWith1PxBorderPainter(
251 SkColorSetA(SK_ColorWHITE, 0x4D), SkColorSetA(SK_ColorWHITE, 0x33), 250 SkColorSetA(SK_ColorWHITE, 0x4D), SkColorSetA(SK_ColorWHITE, 0x33),
252 kBackgroundCornerRadius)))); 251 kBackgroundCornerRadius)));
253 highlight_view_->SetPaintToLayer(true); 252 highlight_view_->SetPaintToLayer(true);
254 highlight_view_->layer()->SetFillsBoundsOpaquely(false); 253 highlight_view_->layer()->SetFillsBoundsOpaquely(false);
255 254
256 AddChildView(highlight_view_); 255 AddChildView(highlight_view_);
257 AddChildView(mirror_container_); 256 AddChildView(mirror_container_);
258 } 257 }
259 258
260 ~WindowCycleView() override {} 259 ~WindowCycleView() override {}
261 260
262 void SetTargetWindow(WmWindow* target) { 261 void SetTargetWindow(WmWindow* target) {
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 widget->Init(params); 551 widget->Init(params);
553 552
554 screen_observer_.Add(display::Screen::GetScreen()); 553 screen_observer_.Add(display::Screen::GetScreen());
555 widget->Show(); 554 widget->Show();
556 widget->SetCapture(cycle_view_); 555 widget->SetCapture(cycle_view_);
557 widget->set_auto_release_capture(false); 556 widget->set_auto_release_capture(false);
558 cycle_ui_widget_ = widget; 557 cycle_ui_widget_ = widget;
559 } 558 }
560 559
561 } // namespace ash 560 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/common/wm/workspace/phantom_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698