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

Side by Side Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 138003007: [Cleanup] Screen cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make sure screen_for_shutdown is reset everytime Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | ash/shell.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/shelf/shelf_layout_manager.h" 5 #include "ash/shelf/shelf_layout_manager.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/accelerators/accelerator_table.h" 8 #include "ash/accelerators/accelerator_table.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
11 #include "ash/focus_cycler.h" 11 #include "ash/focus_cycler.h"
12 #include "ash/root_window_controller.h" 12 #include "ash/root_window_controller.h"
13 #include "ash/screen_ash.h"
14 #include "ash/session_state_delegate.h" 13 #include "ash/session_state_delegate.h"
15 #include "ash/shelf/shelf.h" 14 #include "ash/shelf/shelf.h"
16 #include "ash/shelf/shelf_layout_manager_observer.h" 15 #include "ash/shelf/shelf_layout_manager_observer.h"
17 #include "ash/shelf/shelf_view.h" 16 #include "ash/shelf/shelf_view.h"
18 #include "ash/shelf/shelf_widget.h" 17 #include "ash/shelf/shelf_widget.h"
19 #include "ash/shell.h" 18 #include "ash/shell.h"
20 #include "ash/shell_window_ids.h" 19 #include "ash/shell_window_ids.h"
21 #include "ash/system/status_area_widget.h" 20 #include "ash/system/status_area_widget.h"
22 #include "ash/system/tray/system_tray.h" 21 #include "ash/system/tray/system_tray.h"
23 #include "ash/system/tray/system_tray_item.h" 22 #include "ash/system/tray/system_tray_item.h"
(...skipping 1893 matching lines...) Expand 10 before | Expand all | Expand 10 after
1917 shelf->SetAlignment(SHELF_ALIGNMENT_LEFT); 1916 shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
1918 EXPECT_FALSE(status_area_widget->IsMessageBubbleShown()); 1917 EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
1919 generator.ClickLeftButton(); 1918 generator.ClickLeftButton();
1920 EXPECT_TRUE(status_area_widget->IsMessageBubbleShown()); 1919 EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());
1921 generator.ClickLeftButton(); 1920 generator.ClickLeftButton();
1922 EXPECT_FALSE(status_area_widget->IsMessageBubbleShown()); 1921 EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
1923 } 1922 }
1924 1923
1925 } // namespace internal 1924 } // namespace internal
1926 } // namespace ash 1925 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698