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

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

Issue 2061823002: mash: Move ash constants and layout constants files to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayimageitem
Patch Set: rebase 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 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/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/ash_layout_constants.h" 9 #include "ash/common/ash_layout_constants.h"
10 #include "ash/frame/caption_buttons/frame_caption_button.h" 10 #include "ash/frame/caption_buttons/frame_caption_button.h"
11 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" 11 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/test/ash_test_base.h" 13 #include "ash/test/ash_test_base.h"
14 #include "ash/test/test_session_state_delegate.h" 14 #include "ash/test/test_session_state_delegate.h"
15 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 15 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
16 #include "grit/ash_resources.h" 16 #include "grit/ash_resources.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/gfx/geometry/rect.h" 18 #include "ui/gfx/geometry/rect.h"
19 #include "ui/gfx/image/image_skia.h" 19 #include "ui/gfx/image/image_skia.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 EXPECT_GT(initial.width(), maximize_mode_bounds.width()); 219 EXPECT_GT(initial.width(), maximize_mode_bounds.width());
220 Shell::GetInstance()->maximize_mode_controller()-> 220 Shell::GetInstance()->maximize_mode_controller()->
221 EnableMaximizeModeWindowManager(false); 221 EnableMaximizeModeWindowManager(false);
222 delegate->EndFrameCaptionButtonContainerViewAnimations(); 222 delegate->EndFrameCaptionButtonContainerViewAnimations();
223 const gfx::Rect after_restore = delegate-> 223 const gfx::Rect after_restore = delegate->
224 GetFrameCaptionButtonContainerViewBounds(); 224 GetFrameCaptionButtonContainerViewBounds();
225 EXPECT_EQ(initial, after_restore); 225 EXPECT_EQ(initial, after_restore);
226 } 226 }
227 227
228 } // namespace ash 228 } // namespace ash
OLDNEW
« no previous file with comments | « ash/frame/caption_buttons/frame_size_button_unittest.cc ('k') | ash/frame/default_header_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698