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

Side by Side Diff: views/widget/widget_unittest.cc

Issue 8468029: Fix NWAura to use property to get restored bounds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test fix Created 9 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
« no previous file with comments | « views/widget/native_widget_aura.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/widget/native_widget_views.h" 5 #include "views/widget/native_widget_views.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 828
829 child1->Show(); 829 child1->Show();
830 EXPECT_EQ(child1, widget_shown()); 830 EXPECT_EQ(child1, widget_shown());
831 831
832 child2->Show(); 832 child2->Show();
833 EXPECT_EQ(child2, widget_shown()); 833 EXPECT_EQ(child2, widget_shown());
834 834
835 toplevel->CloseNow(); 835 toplevel->CloseNow();
836 } 836 }
837 837
838 #if !defined(USE_AURA) && defined(OS_WIN)
839 // Aura needs shell to maximize/fullscreen window.
840 // NativeWidgetGtk doesn't implement GetRestoredBounds.
841 TEST_F(WidgetTest, GetRestoredBounds) {
842 Widget* toplevel = CreateTopLevelPlatformWidget();
843 EXPECT_EQ(toplevel->GetWindowScreenBounds().ToString(),
844 toplevel->GetRestoredBounds().ToString());
845 toplevel->Show();
846 toplevel->Maximize();
847 RunPendingMessages();
848 EXPECT_NE(toplevel->GetWindowScreenBounds().ToString(),
849 toplevel->GetRestoredBounds().ToString());
850 EXPECT_GT(toplevel->GetRestoredBounds().width(), 0);
851 EXPECT_GT(toplevel->GetRestoredBounds().height(), 0);
852
853 toplevel->Restore();
854 RunPendingMessages();
855 EXPECT_EQ(toplevel->GetWindowScreenBounds().ToString(),
856 toplevel->GetRestoredBounds().ToString());
857
858 toplevel->SetFullscreen(true);
859 RunPendingMessages();
860 EXPECT_NE(toplevel->GetWindowScreenBounds().ToString(),
861 toplevel->GetRestoredBounds().ToString());
862 EXPECT_GT(toplevel->GetRestoredBounds().width(), 0);
863 EXPECT_GT(toplevel->GetRestoredBounds().height(), 0);
864 }
865 #endif
866
838 } // namespace 867 } // namespace
839 } // namespace views 868 } // namespace views
OLDNEW
« no previous file with comments | « views/widget/native_widget_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698