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

Side by Side Diff: ash/shelf/shelf_widget.cc

Issue 2887463003: [ash-md] Removed unwanted TODO from ShelfWidget::DelegateView::opaque_background_ (Closed)
Patch Set: Created 3 years, 7 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/shelf/shelf_widget.h" 5 #include "ash/shelf/shelf_widget.h"
6 6
7 #include "ash/animation/animation_change_type.h" 7 #include "ash/animation/animation_change_type.h"
8 #include "ash/focus_cycler.h" 8 #include "ash/focus_cycler.h"
9 #include "ash/public/cpp/window_properties.h" 9 #include "ash/public/cpp/window_properties.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 void OnBoundsChanged(const gfx::Rect& old_bounds) override; 59 void OnBoundsChanged(const gfx::Rect& old_bounds) override;
60 60
61 // ShelfBackgroundAnimatorObserver: 61 // ShelfBackgroundAnimatorObserver:
62 void UpdateShelfBackground(SkColor color) override; 62 void UpdateShelfBackground(SkColor color) override;
63 63
64 private: 64 private:
65 ShelfWidget* shelf_widget_; 65 ShelfWidget* shelf_widget_;
66 FocusCycler* focus_cycler_; 66 FocusCycler* focus_cycler_;
67 // A black background layer that may be visible depending on a 67 // A black background layer that may be visible depending on a
68 // ShelfBackgroundAnimator. 68 // ShelfBackgroundAnimator.
69 // TODO(bruthig): Remove opaque_background_ (see https://crbug.com/621551).
70 ui::Layer opaque_background_; 69 ui::Layer opaque_background_;
71 // A black foreground layer which is shown while transitioning between users. 70 // A black foreground layer which is shown while transitioning between users.
72 // Note: Since the back- and foreground layers have different functions they 71 // Note: Since the back- and foreground layers have different functions they
73 // can be used simultaneously - so no repurposing possible. 72 // can be used simultaneously - so no repurposing possible.
74 ui::Layer opaque_foreground_; 73 ui::Layer opaque_foreground_;
75 74
76 DISALLOW_COPY_AND_ASSIGN(DelegateView); 75 DISALLOW_COPY_AND_ASSIGN(DelegateView);
77 }; 76 };
78 77
79 ShelfWidget::DelegateView::DelegateView(ShelfWidget* shelf_widget) 78 ShelfWidget::DelegateView::DelegateView(ShelfWidget* shelf_widget)
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 if (shelf_view_) 343 if (shelf_view_)
345 shelf_view_->UpdateShelfItemBackground(color); 344 shelf_view_->UpdateShelfItemBackground(color);
346 } 345 }
347 346
348 void ShelfWidget::WillDeleteShelfLayoutManager() { 347 void ShelfWidget::WillDeleteShelfLayoutManager() {
349 shelf_layout_manager_->RemoveObserver(this); 348 shelf_layout_manager_->RemoveObserver(this);
350 shelf_layout_manager_ = nullptr; 349 shelf_layout_manager_ = nullptr;
351 } 350 }
352 351
353 } // namespace ash 352 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698