| OLD | NEW |
| 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 "ash/metrics/user_metrics_recorder.h" | 5 #include "ash/metrics/user_metrics_recorder.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "ash/aura/wm_window_aura.h" | |
| 10 #include "ash/common/login_status.h" | 9 #include "ash/common/login_status.h" |
| 11 #include "ash/common/shelf/shelf_model.h" | 10 #include "ash/common/shelf/shelf_model.h" |
| 12 #include "ash/common/test/test_shelf_delegate.h" | 11 #include "ash/common/test/test_shelf_delegate.h" |
| 13 #include "ash/common/test/test_system_tray_delegate.h" | 12 #include "ash/common/test/test_system_tray_delegate.h" |
| 14 #include "ash/common/wm_shell.h" | 13 #include "ash/common/wm_shell.h" |
| 14 #include "ash/common/wm_window.h" |
| 15 #include "ash/test/ash_test_base.h" | 15 #include "ash/test/ash_test_base.h" |
| 16 #include "ash/test/user_metrics_recorder_test_api.h" | 16 #include "ash/test/user_metrics_recorder_test_api.h" |
| 17 #include "base/test/histogram_tester.h" | 17 #include "base/test/histogram_tester.h" |
| 18 #include "ui/aura/window.h" | 18 #include "ui/aura/window.h" |
| 19 | 19 |
| 20 namespace ash { | 20 namespace ash { |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| 23 const char kAsh_NumberOfVisibleWindowsInPrimaryDisplay[] = | 23 const char kAsh_NumberOfVisibleWindowsInPrimaryDisplay[] = |
| 24 "Ash.NumberOfVisibleWindowsInPrimaryDisplay"; | 24 "Ash.NumberOfVisibleWindowsInPrimaryDisplay"; |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 test::TestShelfDelegate* test_shelf_delegate = | 190 test::TestShelfDelegate* test_shelf_delegate = |
| 191 test::TestShelfDelegate::instance(); | 191 test::TestShelfDelegate::instance(); |
| 192 SetUserInActiveDesktopEnvironment(true); | 192 SetUserInActiveDesktopEnvironment(true); |
| 193 | 193 |
| 194 // Make sure the shelf contains the app list launcher button. | 194 // Make sure the shelf contains the app list launcher button. |
| 195 const ShelfItems& shelf_items = WmShell::Get()->shelf_model()->items(); | 195 const ShelfItems& shelf_items = WmShell::Get()->shelf_model()->items(); |
| 196 ASSERT_EQ(1u, shelf_items.size()); | 196 ASSERT_EQ(1u, shelf_items.size()); |
| 197 ASSERT_EQ(TYPE_APP_LIST, shelf_items[0].type); | 197 ASSERT_EQ(TYPE_APP_LIST, shelf_items[0].type); |
| 198 | 198 |
| 199 aura::Window* pinned_window_with_app_id_1 = CreateTestWindow(); | 199 aura::Window* pinned_window_with_app_id_1 = CreateTestWindow(); |
| 200 test_shelf_delegate->AddShelfItem( | 200 test_shelf_delegate->AddShelfItem(WmWindow::Get(pinned_window_with_app_id_1), |
| 201 WmWindowAura::Get(pinned_window_with_app_id_1), "app_id_1"); | 201 "app_id_1"); |
| 202 test_shelf_delegate->PinAppWithID("app_id_1"); | 202 test_shelf_delegate->PinAppWithID("app_id_1"); |
| 203 | 203 |
| 204 aura::Window* pinned_window_with_app_id_2 = CreateTestWindow(); | 204 aura::Window* pinned_window_with_app_id_2 = CreateTestWindow(); |
| 205 test_shelf_delegate->AddShelfItem( | 205 test_shelf_delegate->AddShelfItem(WmWindow::Get(pinned_window_with_app_id_2), |
| 206 WmWindowAura::Get(pinned_window_with_app_id_2), "app_id_2"); | 206 "app_id_2"); |
| 207 test_shelf_delegate->PinAppWithID("app_id_2"); | 207 test_shelf_delegate->PinAppWithID("app_id_2"); |
| 208 | 208 |
| 209 aura::Window* unpinned_window_with_app_id_3 = CreateTestWindow(); | 209 aura::Window* unpinned_window_with_app_id_3 = CreateTestWindow(); |
| 210 test_shelf_delegate->AddShelfItem( | 210 test_shelf_delegate->AddShelfItem( |
| 211 WmWindowAura::Get(unpinned_window_with_app_id_3), "app_id_3"); | 211 WmWindow::Get(unpinned_window_with_app_id_3), "app_id_3"); |
| 212 | 212 |
| 213 aura::Window* unpinned_window_4 = CreateTestWindow(); | 213 aura::Window* unpinned_window_4 = CreateTestWindow(); |
| 214 test_shelf_delegate->AddShelfItem(WmWindowAura::Get(unpinned_window_4)); | 214 test_shelf_delegate->AddShelfItem(WmWindow::Get(unpinned_window_4)); |
| 215 | 215 |
| 216 aura::Window* unpinned_window_5 = CreateTestWindow(); | 216 aura::Window* unpinned_window_5 = CreateTestWindow(); |
| 217 test_shelf_delegate->AddShelfItem(WmWindowAura::Get(unpinned_window_5)); | 217 test_shelf_delegate->AddShelfItem(WmWindow::Get(unpinned_window_5)); |
| 218 | 218 |
| 219 user_metrics_recorder_test_api()->RecordPeriodicMetrics(); | 219 user_metrics_recorder_test_api()->RecordPeriodicMetrics(); |
| 220 histograms().ExpectBucketCount(kAsh_Shelf_NumberOfItems, 5, 1); | 220 histograms().ExpectBucketCount(kAsh_Shelf_NumberOfItems, 5, 1); |
| 221 histograms().ExpectBucketCount(kAsh_Shelf_NumberOfPinnedItems, 2, 1); | 221 histograms().ExpectBucketCount(kAsh_Shelf_NumberOfPinnedItems, 2, 1); |
| 222 histograms().ExpectBucketCount(kAsh_Shelf_NumberOfUnpinnedItems, 3, 1); | 222 histograms().ExpectBucketCount(kAsh_Shelf_NumberOfUnpinnedItems, 3, 1); |
| 223 } | 223 } |
| 224 | 224 |
| 225 } // namespace ash | 225 } // namespace ash |
| OLD | NEW |