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

Side by Side Diff: ash/frame/custom_frame_view_ash_unittest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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 | « ash/frame/custom_frame_view_ash.cc ('k') | ash/frame/default_header_painter.h » ('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/frame/custom_frame_view_ash.h" 5 #include "ash/frame/custom_frame_view_ash.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/common/ash_layout_constants.h" 9 #include "ash/ash_layout_constants.h"
10 #include "ash/common/frame/caption_buttons/frame_caption_button.h" 10 #include "ash/frame/caption_buttons/frame_caption_button.h"
11 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h " 11 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
12 #include "ash/common/test/test_session_state_delegate.h"
13 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
14 #include "ash/common/wm_shell.h"
15 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
13 #include "ash/test/test_session_state_delegate.h"
14 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
15 #include "ash/wm_shell.h"
16 #include "ui/gfx/geometry/rect.h" 16 #include "ui/gfx/geometry/rect.h"
17 #include "ui/gfx/image/image_skia.h" 17 #include "ui/gfx/image/image_skia.h"
18 #include "ui/gfx/image/image_unittest_util.h" 18 #include "ui/gfx/image/image_unittest_util.h"
19 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 #include "ui/views/widget/widget_delegate.h" 20 #include "ui/views/widget/widget_delegate.h"
21 21
22 namespace ash { 22 namespace ash {
23 23
24 // A views::WidgetDelegate which uses a CustomFrameViewAsh. 24 // A views::WidgetDelegate which uses a CustomFrameViewAsh.
25 class TestWidgetDelegate : public views::WidgetDelegateView { 25 class TestWidgetDelegate : public views::WidgetDelegateView {
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 EXPECT_GT(initial.width(), maximize_mode_bounds.width()); 218 EXPECT_GT(initial.width(), maximize_mode_bounds.width());
219 WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager( 219 WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
220 false); 220 false);
221 delegate->EndFrameCaptionButtonContainerViewAnimations(); 221 delegate->EndFrameCaptionButtonContainerViewAnimations();
222 const gfx::Rect after_restore = 222 const gfx::Rect after_restore =
223 delegate->GetFrameCaptionButtonContainerViewBounds(); 223 delegate->GetFrameCaptionButtonContainerViewBounds();
224 EXPECT_EQ(initial, after_restore); 224 EXPECT_EQ(initial, after_restore);
225 } 225 }
226 226
227 } // namespace ash 227 } // namespace ash
OLDNEW
« no previous file with comments | « ash/frame/custom_frame_view_ash.cc ('k') | ash/frame/default_header_painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698