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

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

Issue 2480813003: Reduce views::Border creation verbosity by promoting factory functions (Closed)
Patch Set: fix bad merge Created 4 years, 1 month 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 | « ash/common/wm/overview/window_selector.cc ('k') | ash/common/wm/window_cycle_list.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 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"
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 params_label.accept_events = true; 625 params_label.accept_events = true;
626 root_window_->GetRootWindowController() 626 root_window_->GetRootWindowController()
627 ->ConfigureWidgetInitParamsForContainer( 627 ->ConfigureWidgetInitParamsForContainer(
628 window_label_.get(), 628 window_label_.get(),
629 transform_window_.window()->GetParent()->GetShellWindowId(), 629 transform_window_.window()->GetParent()->GetShellWindowId(),
630 &params_label); 630 &params_label);
631 window_label_.reset(new views::Widget); 631 window_label_.reset(new views::Widget);
632 window_label_->set_focus_on_creation(false); 632 window_label_->set_focus_on_creation(false);
633 window_label_->Init(params_label); 633 window_label_->Init(params_label);
634 window_label_button_view_ = new OverviewLabelButton(this, title); 634 window_label_button_view_ = new OverviewLabelButton(this, title);
635 window_label_button_view_->SetBorder(views::Border::NullBorder()); 635 window_label_button_view_->SetBorder(views::NullBorder());
636 window_label_button_view_->SetEnabledTextColors(kLabelColor); 636 window_label_button_view_->SetEnabledTextColors(kLabelColor);
637 window_label_button_view_->set_animate_on_state_change(false); 637 window_label_button_view_->set_animate_on_state_change(false);
638 WmWindow* label_window = 638 WmWindow* label_window =
639 WmLookup::Get()->GetWindowForWidget(window_label_.get()); 639 WmLookup::Get()->GetWindowForWidget(window_label_.get());
640 if (transform_window_.GetTopInset()) { 640 if (transform_window_.GetTopInset()) {
641 // For windows with headers the overview header fades in above the 641 // For windows with headers the overview header fades in above the
642 // original window header. 642 // original window header.
643 label_window->GetParent()->StackChildAbove(label_window, 643 label_window->GetParent()->StackChildAbove(label_window,
644 transform_window_.window()); 644 transform_window_.window());
645 } else { 645 } else {
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 window_selector_->delegate()->AddDelayedAnimationObserver( 781 window_selector_->delegate()->AddDelayedAnimationObserver(
782 std::move(observer)); 782 std::move(observer));
783 widget_ptr->SetOpacity(0.f); 783 widget_ptr->SetOpacity(0.f);
784 } 784 }
785 785
786 gfx::SlideAnimation* WindowSelectorItem::GetBackgroundViewAnimation() { 786 gfx::SlideAnimation* WindowSelectorItem::GetBackgroundViewAnimation() {
787 return background_view_ ? background_view_->animation() : nullptr; 787 return background_view_ ? background_view_->animation() : nullptr;
788 } 788 }
789 789
790 } // namespace ash 790 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm/overview/window_selector.cc ('k') | ash/common/wm/window_cycle_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698