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

Side by Side Diff: ash/common/wm/overview/window_selector_item.cc

Issue 2441043003: A few more cleanups to overview mode code related to the pre-MD version. (Closed)
Patch Set: Created 4 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "ash/common/wm/overview/window_selector_item.h" 5 #include "ash/common/wm/overview/window_selector_item.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/material_design/material_design_controller.h" 10 #include "ash/common/material_design/material_design_controller.h"
11 #include "ash/common/metrics/user_metrics_action.h" 11 #include "ash/common/metrics/user_metrics_action.h"
12 #include "ash/common/wm/overview/cleanup_animation_observer.h" 12 #include "ash/common/wm/overview/cleanup_animation_observer.h"
13 #include "ash/common/wm/overview/overview_animation_type.h" 13 #include "ash/common/wm/overview/overview_animation_type.h"
14 #include "ash/common/wm/overview/scoped_overview_animation_settings.h" 14 #include "ash/common/wm/overview/scoped_overview_animation_settings.h"
15 #include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h" 15 #include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h"
16 #include "ash/common/wm/overview/scoped_transform_overview_window.h" 16 #include "ash/common/wm/overview/scoped_transform_overview_window.h"
17 #include "ash/common/wm/overview/window_selector.h" 17 #include "ash/common/wm/overview/window_selector.h"
18 #include "ash/common/wm/overview/window_selector_controller.h" 18 #include "ash/common/wm/overview/window_selector_controller.h"
19 #include "ash/common/wm/window_state.h" 19 #include "ash/common/wm/window_state.h"
20 #include "ash/common/wm_lookup.h" 20 #include "ash/common/wm_lookup.h"
21 #include "ash/common/wm_root_window_controller.h" 21 #include "ash/common/wm_root_window_controller.h"
22 #include "ash/common/wm_shell.h" 22 #include "ash/common/wm_shell.h"
23 #include "ash/common/wm_window.h" 23 #include "ash/common/wm_window.h"
24 #include "ash/common/wm_window_property.h" 24 #include "ash/common/wm_window_property.h"
25 #include "ash/public/cpp/shell_window_ids.h" 25 #include "ash/public/cpp/shell_window_ids.h"
26 #include "base/auto_reset.h" 26 #include "base/auto_reset.h"
27 #include "base/strings/string_util.h" 27 #include "base/strings/string_util.h"
28 #include "base/strings/utf_string_conversions.h" 28 #include "base/strings/utf_string_conversions.h"
29 #include "base/time/time.h" 29 #include "base/time/time.h"
30 #include "grit/ash_resources.h"
31 #include "grit/ash_strings.h" 30 #include "grit/ash_strings.h"
32 #include "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/resource/resource_bundle.h"
34 #include "ui/compositor/layer_animation_sequence.h" 32 #include "ui/compositor/layer_animation_sequence.h"
35 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 33 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
36 #include "ui/gfx/animation/slide_animation.h" 34 #include "ui/gfx/animation/slide_animation.h"
37 #include "ui/gfx/canvas.h" 35 #include "ui/gfx/canvas.h"
38 #include "ui/gfx/color_utils.h" 36 #include "ui/gfx/color_utils.h"
39 #include "ui/gfx/geometry/safe_integer_conversions.h" 37 #include "ui/gfx/geometry/safe_integer_conversions.h"
40 #include "ui/gfx/geometry/vector2d.h"
41 #include "ui/gfx/paint_vector_icon.h" 38 #include "ui/gfx/paint_vector_icon.h"
42 #include "ui/gfx/transform_util.h" 39 #include "ui/gfx/transform_util.h"
43 #include "ui/gfx/vector_icons_public.h" 40 #include "ui/gfx/vector_icons_public.h"
44 #include "ui/strings/grit/ui_strings.h" 41 #include "ui/strings/grit/ui_strings.h"
45 #include "ui/views/background.h" 42 #include "ui/views/background.h"
46 #include "ui/views/border.h" 43 #include "ui/views/border.h"
47 #include "ui/views/layout/box_layout.h" 44 #include "ui/views/layout/box_layout.h"
48 #include "ui/views/window/non_client_view.h" 45 #include "ui/views/window/non_client_view.h"
49 #include "ui/wm/core/shadow.h" 46 #include "ui/wm/core/shadow.h"
50 #include "ui/wm/core/window_util.h" 47 #include "ui/wm/core/window_util.h"
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 // original window header. 643 // original window header.
647 label_window->GetParent()->StackChildAbove(label_window, 644 label_window->GetParent()->StackChildAbove(label_window,
648 transform_window_.window()); 645 transform_window_.window());
649 } else { 646 } else {
650 // For tabbed windows the overview header slides from behind. The stacking 647 // For tabbed windows the overview header slides from behind. The stacking
651 // is then corrected when the animation completes. 648 // is then corrected when the animation completes.
652 label_window->GetParent()->StackChildBelow(label_window, 649 label_window->GetParent()->StackChildBelow(label_window,
653 transform_window_.window()); 650 transform_window_.window());
654 } 651 }
655 window_label_button_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT); 652 window_label_button_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
656 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
657 window_label_button_view_->SetFontList(
658 bundle.GetFontList(ui::ResourceBundle::BaseFont));
659 // Hint at the background color that the label will be drawn onto (for 653 // Hint at the background color that the label will be drawn onto (for
660 // subpixel antialiasing). Does not actually set the background color. 654 // subpixel antialiasing). Does not actually set the background color.
661 window_label_button_view_->SetBackgroundColorHint(kLabelBackgroundColor); 655 window_label_button_view_->SetBackgroundColorHint(kLabelBackgroundColor);
662 caption_container_view_ = new CaptionContainerView( 656 caption_container_view_ = new CaptionContainerView(
663 window_label_button_view_, close_button_, background_view_); 657 window_label_button_view_, close_button_, background_view_);
664 window_label_->SetContentsView(caption_container_view_); 658 window_label_->SetContentsView(caption_container_view_);
665 window_label_button_view_->SetVisible(false); 659 window_label_button_view_->SetVisible(false);
666 window_label_->SetOpacity(0); 660 window_label_->SetOpacity(0);
667 window_label_->Show(); 661 window_label_->Show();
668 662
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 window_selector_->delegate()->AddDelayedAnimationObserver( 782 window_selector_->delegate()->AddDelayedAnimationObserver(
789 std::move(observer)); 783 std::move(observer));
790 widget_ptr->SetOpacity(0.f); 784 widget_ptr->SetOpacity(0.f);
791 } 785 }
792 786
793 gfx::SlideAnimation* WindowSelectorItem::GetBackgroundViewAnimation() { 787 gfx::SlideAnimation* WindowSelectorItem::GetBackgroundViewAnimation() {
794 return background_view_ ? background_view_->animation() : nullptr; 788 return background_view_ ? background_view_->animation() : nullptr;
795 } 789 }
796 790
797 } // namespace ash 791 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm/overview/scoped_transform_overview_window.cc ('k') | ash/resources/ash_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698