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

Side by Side Diff: chrome/browser/extensions/platform_app_browsertest.cc

Issue 14031021: Save and restore State for ShellWindows, including panels (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 7 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
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 #if defined(TOOLKIT_GTK) 625 #if defined(TOOLKIT_GTK)
626 #define MAYBE_ShellWindowRestorePosition DISABLED_ShellWindowRestorePosition 626 #define MAYBE_ShellWindowRestorePosition DISABLED_ShellWindowRestorePosition
627 #else 627 #else
628 #define MAYBE_ShellWindowRestorePosition ShellWindowRestorePosition 628 #define MAYBE_ShellWindowRestorePosition ShellWindowRestorePosition
629 #endif 629 #endif
630 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, 630 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
631 MAYBE_ShellWindowRestorePosition) { 631 MAYBE_ShellWindowRestorePosition) {
632 ASSERT_TRUE(RunPlatformAppTest("platform_apps/geometry")); 632 ASSERT_TRUE(RunPlatformAppTest("platform_apps/geometry"));
633 } 633 }
634 634
635 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
636 ShellWindowRestoreState) {
637 ASSERT_TRUE(RunPlatformAppTest("platform_apps/restore_state"));
638 }
639
635 namespace { 640 namespace {
636 641
637 class PlatformAppDevToolsBrowserTest : public PlatformAppBrowserTest { 642 class PlatformAppDevToolsBrowserTest : public PlatformAppBrowserTest {
638 protected: 643 protected:
639 enum TestFlags { 644 enum TestFlags {
640 RELAUNCH = 0x1, 645 RELAUNCH = 0x1,
641 HAS_ID = 0x2, 646 HAS_ID = 0x2,
642 }; 647 };
643 // Runs a test inside a harness that opens DevTools on a shell window. 648 // Runs a test inside a harness that opens DevTools on a shell window.
644 void RunTestWithDevTools(const char* name, int test_flags); 649 void RunTestWithDevTools(const char* name, int test_flags);
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 979
975 while (!ContainsKey(opener_app_ids_, file_manager->id())) { 980 while (!ContainsKey(opener_app_ids_, file_manager->id())) {
976 content::RunAllPendingInMessageLoop(); 981 content::RunAllPendingInMessageLoop();
977 } 982 }
978 } 983 }
979 984
980 #endif // defined(OS_CHROMEOS) 985 #endif // defined(OS_CHROMEOS)
981 986
982 987
983 } // namespace extensions 988 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698