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

Side by Side Diff: ash/app_list/app_list_presenter_delegate_unittest.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase Created 4 years, 2 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/app_list/app_list_presenter_delegate.cc ('k') | ash/aura/wm_window_aura.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 <memory> 5 #include <memory>
6 6
7 #include "ash/common/shell_window_ids.h"
8 #include "ash/common/wm_shell.h" 7 #include "ash/common/wm_shell.h"
9 #include "ash/common/wm_window.h" 8 #include "ash/common/wm_window.h"
9 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/test/ash_test_base.h" 11 #include "ash/test/ash_test_base.h"
12 #include "ash/test/ash_test_helper.h" 12 #include "ash/test/ash_test_helper.h"
13 #include "ash/test/test_shell_delegate.h" 13 #include "ash/test/test_shell_delegate.h"
14 #include "ash/wm/window_util.h" 14 #include "ash/wm/window_util.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "ui/app_list/app_list_switches.h" 16 #include "ui/app_list/app_list_switches.h"
17 #include "ui/app_list/presenter/app_list_presenter_impl.h" 17 #include "ui/app_list/presenter/app_list_presenter_impl.h"
18 #include "ui/app_list/views/app_list_view.h" 18 #include "ui/app_list/views/app_list_view.h"
19 #include "ui/aura/test/test_windows.h" 19 #include "ui/aura/test/test_windows.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // from the anchor (center) and height. There isn't a bounds rect that gives 161 // from the anchor (center) and height. There isn't a bounds rect that gives
162 // the actual app list position (the widget bounds include the bubble border 162 // the actual app list position (the widget bounds include the bubble border
163 // which is much bigger than the actual app list size). 163 // which is much bigger than the actual app list size).
164 app_list::AppListView* app_list = GetAppListPresenter()->GetView(); 164 app_list::AppListView* app_list = GetAppListPresenter()->GetView();
165 int app_list_view_top = 165 int app_list_view_top =
166 app_list->anchor_rect().y() - app_list->bounds().height() / 2; 166 app_list->anchor_rect().y() - app_list->bounds().height() / 2;
167 EXPECT_GE(app_list_view_top, kMinimalAppListMargin); 167 EXPECT_GE(app_list_view_top, kMinimalAppListMargin);
168 } 168 }
169 169
170 } // namespace ash 170 } // namespace ash
OLDNEW
« no previous file with comments | « ash/app_list/app_list_presenter_delegate.cc ('k') | ash/aura/wm_window_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698