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

Side by Side Diff: ash/mus/frame/caption_buttons/frame_caption_button_container_view.cc

Issue 2029883002: Moves mash/wm into ash/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_static_assert
Patch Set: move comment Created 4 years, 6 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "mash/wm/frame/caption_buttons/frame_caption_button_container_view.h" 5 #include "ash/mus/frame/caption_buttons/frame_caption_button_container_view.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <map> 10 #include <map>
11 11
12 #include "ash/mus/frame/caption_buttons/frame_caption_button.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "mash/wm/frame/caption_buttons/frame_caption_button.h"
14 #include "ui/base/hit_test.h" 14 #include "ui/base/hit_test.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/gfx/animation/slide_animation.h" 16 #include "ui/gfx/animation/slide_animation.h"
17 #include "ui/gfx/animation/tween.h" 17 #include "ui/gfx/animation/tween.h"
18 #include "ui/gfx/canvas.h" 18 #include "ui/gfx/canvas.h"
19 #include "ui/gfx/geometry/insets.h" 19 #include "ui/gfx/geometry/insets.h"
20 #include "ui/gfx/geometry/point.h" 20 #include "ui/gfx/geometry/point.h"
21 #include "ui/strings/grit/ui_strings.h" // Accessibility names 21 #include "ui/strings/grit/ui_strings.h" // Accessibility names
22 #include "ui/views/widget/widget.h" 22 #include "ui/views/widget/widget.h"
23 #include "ui/views/widget/widget_delegate.h" 23 #include "ui/views/widget/widget_delegate.h"
24 24
25 namespace mash { 25 namespace ash {
26 namespace wm { 26 namespace mus {
27 27
28 namespace { 28 namespace {
29 29
30 // Duration of the animation of the position of |minimize_button_|. 30 // Duration of the animation of the position of |minimize_button_|.
31 const int kPositionAnimationDurationMs = 500; 31 const int kPositionAnimationDurationMs = 500;
32 32
33 // Duration of the animation of the alpha of |size_button_|. 33 // Duration of the animation of the alpha of |size_button_|.
34 const int kAlphaAnimationDurationMs = 250; 34 const int kAlphaAnimationDurationMs = 250;
35 35
36 // Delay during |maximize_mode_animation_| hide to wait before beginning to 36 // Delay during |maximize_mode_animation_| hide to wait before beginning to
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 FrameCaptionButtonContainerView::ButtonIconIds::ButtonIconIds( 345 FrameCaptionButtonContainerView::ButtonIconIds::ButtonIconIds(
346 int icon_id, 346 int icon_id,
347 int hovered_background_id, 347 int hovered_background_id,
348 int pressed_background_id) 348 int pressed_background_id)
349 : icon_image_id(icon_id), 349 : icon_image_id(icon_id),
350 hovered_background_image_id(hovered_background_id), 350 hovered_background_image_id(hovered_background_id),
351 pressed_background_image_id(pressed_background_id) {} 351 pressed_background_image_id(pressed_background_id) {}
352 352
353 FrameCaptionButtonContainerView::ButtonIconIds::~ButtonIconIds() {} 353 FrameCaptionButtonContainerView::ButtonIconIds::~ButtonIconIds() {}
354 354
355 } // namespace wm 355 } // namespace mus
356 } // namespace mash 356 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/frame/caption_buttons/frame_caption_button_container_view.h ('k') | ash/mus/frame/default_header_painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698