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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/shelf/shelf_view_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/shelf/shelf_view.cc ('k') | ash/shelf/shelf_widget.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shelf/shelf_view.h" 5 #include "ash/shelf/shelf_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/common/shelf/app_list_button.h"
13 #include "ash/common/shelf/overflow_bubble.h"
14 #include "ash/common/shelf/overflow_bubble_view.h"
15 #include "ash/common/shelf/overflow_button.h"
16 #include "ash/common/shelf/shelf_button.h"
17 #include "ash/common/shelf/shelf_constants.h"
18 #include "ash/common/shelf/shelf_model.h"
19 #include "ash/common/shelf/shelf_tooltip_manager.h"
20 #include "ash/common/shelf/shelf_widget.h"
21 #include "ash/common/shelf/wm_shelf.h"
22 #include "ash/common/shelf/wm_shelf_observer.h"
23 #include "ash/common/test/test_shelf_delegate.h"
24 #include "ash/common/test/test_shelf_item_delegate.h"
25 #include "ash/common/test/test_system_tray_delegate.h"
26 #include "ash/common/wm_shell.h"
27 #include "ash/common/wm_window.h"
28 #include "ash/public/cpp/shell_window_ids.h" 12 #include "ash/public/cpp/shell_window_ids.h"
29 #include "ash/root_window_controller.h" 13 #include "ash/root_window_controller.h"
14 #include "ash/shelf/app_list_button.h"
15 #include "ash/shelf/overflow_bubble.h"
16 #include "ash/shelf/overflow_bubble_view.h"
17 #include "ash/shelf/overflow_button.h"
18 #include "ash/shelf/shelf_button.h"
19 #include "ash/shelf/shelf_constants.h"
20 #include "ash/shelf/shelf_model.h"
21 #include "ash/shelf/shelf_tooltip_manager.h"
22 #include "ash/shelf/shelf_widget.h"
23 #include "ash/shelf/wm_shelf.h"
24 #include "ash/shelf/wm_shelf_observer.h"
30 #include "ash/shell.h" 25 #include "ash/shell.h"
31 #include "ash/system/web_notification/web_notification_tray.h" 26 #include "ash/system/web_notification/web_notification_tray.h"
32 #include "ash/test/ash_test_base.h" 27 #include "ash/test/ash_test_base.h"
33 #include "ash/test/ash_test_helper.h" 28 #include "ash/test/ash_test_helper.h"
34 #include "ash/test/overflow_bubble_view_test_api.h" 29 #include "ash/test/overflow_bubble_view_test_api.h"
35 #include "ash/test/shelf_view_test_api.h" 30 #include "ash/test/shelf_view_test_api.h"
31 #include "ash/test/test_shelf_delegate.h"
32 #include "ash/test/test_shelf_item_delegate.h"
36 #include "ash/test/test_shell_delegate.h" 33 #include "ash/test/test_shell_delegate.h"
34 #include "ash/test/test_system_tray_delegate.h"
35 #include "ash/wm_shell.h"
36 #include "ash/wm_window.h"
37 #include "base/i18n/rtl.h" 37 #include "base/i18n/rtl.h"
38 #include "base/macros.h" 38 #include "base/macros.h"
39 #include "base/memory/ptr_util.h" 39 #include "base/memory/ptr_util.h"
40 #include "base/run_loop.h" 40 #include "base/run_loop.h"
41 #include "base/strings/string_number_conversions.h" 41 #include "base/strings/string_number_conversions.h"
42 #include "base/strings/utf_string_conversions.h" 42 #include "base/strings/utf_string_conversions.h"
43 #include "base/test/histogram_tester.h" 43 #include "base/test/histogram_tester.h"
44 #include "base/test/scoped_mock_time_message_loop_task_runner.h" 44 #include "base/test/scoped_mock_time_message_loop_task_runner.h"
45 #include "base/test/user_action_tester.h" 45 #include "base/test/user_action_tester.h"
46 #include "base/time/time.h" 46 #include "base/time/time.h"
(...skipping 2960 matching lines...) Expand 10 before | Expand all | Expand 10 after
3007 EXPECT_EQ(views::InkDropState::ACTIVATED, 3007 EXPECT_EQ(views::InkDropState::ACTIVATED,
3008 overflow_button_ink_drop_->GetTargetInkDropState()); 3008 overflow_button_ink_drop_->GetTargetInkDropState());
3009 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 3009 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
3010 IsEmpty()); 3010 IsEmpty());
3011 3011
3012 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); 3012 ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
3013 } 3013 }
3014 3014
3015 } // namespace test 3015 } // namespace test
3016 } // namespace ash 3016 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/shelf/shelf_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698