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

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

Issue 11293028: GTTF: remove FAILS_ prefix, part 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
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/wm/shelf_layout_manager.h" 5 #include "ash/wm/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/focus_cycler.h" 10 #include "ash/focus_cycler.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 CommandLine::ForCurrentProcess()->AppendSwitch( 180 CommandLine::ForCurrentProcess()->AppendSwitch(
181 ash::switches::kAshEnableTrayDragging); 181 ash::switches::kAshEnableTrayDragging);
182 test::AshTestBase::SetUp(); 182 test::AshTestBase::SetUp();
183 } 183 }
184 private: 184 private:
185 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManagerTest); 185 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManagerTest);
186 }; 186 };
187 187
188 // Fails on Mac only. Need to be implemented. http://crbug.com/111279. 188 // Fails on Mac only. Need to be implemented. http://crbug.com/111279.
189 #if defined(OS_MACOSX) 189 #if defined(OS_MACOSX)
190 #define MAYBE_SetVisible FAILS_SetVisible 190 #define MAYBE_SetVisible DISABLED_SetVisible
191 #else 191 #else
192 #define MAYBE_SetVisible SetVisible 192 #define MAYBE_SetVisible SetVisible
193 #endif 193 #endif
194 // Makes sure SetVisible updates work area and widget appropriately. 194 // Makes sure SetVisible updates work area and widget appropriately.
195 TEST_F(ShelfLayoutManagerTest, MAYBE_SetVisible) { 195 TEST_F(ShelfLayoutManagerTest, MAYBE_SetVisible) {
196 ShelfLayoutManager* shelf = GetShelfLayoutManager(); 196 ShelfLayoutManager* shelf = GetShelfLayoutManager();
197 // Force an initial layout. 197 // Force an initial layout.
198 shelf->LayoutShelf(); 198 shelf->LayoutShelf();
199 EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state()); 199 EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
200 200
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 EXPECT_TRUE(status_area_widget->IsMessageBubbleShown()); 977 EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());
978 } else { 978 } else {
979 EXPECT_FALSE(shelf->IsVisible()); 979 EXPECT_FALSE(shelf->IsVisible());
980 EXPECT_FALSE(status_area_widget->IsMessageBubbleShown()); 980 EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
981 } 981 }
982 } 982 }
983 } 983 }
984 984
985 } // namespace internal 985 } // namespace internal
986 } // namespace ash 986 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/base_layout_manager_unittest.cc ('k') | ash/wm/toplevel_window_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698