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

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

Issue 14663010: Save and restore State for ShellWindows, including panels (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 // This appears to be unreliable on linux.
636 // TODO(stevenjb): Investigate and enable
637 #if defined(OS_LINUX) && !defined(USE_ASH)
638 #define MAYBE_ShellWindowRestoreState DISABLED_ShellWindowRestoreState
639 #else
640 #define MAYBE_ShellWindowRestoreState ShellWindowRestoreState
641 #endif
642 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
643 MAYBE_ShellWindowRestoreState) {
644 ASSERT_TRUE(RunPlatformAppTest("platform_apps/restore_state"));
645 }
646
635 namespace { 647 namespace {
636 648
637 class PlatformAppDevToolsBrowserTest : public PlatformAppBrowserTest { 649 class PlatformAppDevToolsBrowserTest : public PlatformAppBrowserTest {
638 protected: 650 protected:
639 enum TestFlags { 651 enum TestFlags {
640 RELAUNCH = 0x1, 652 RELAUNCH = 0x1,
641 HAS_ID = 0x2, 653 HAS_ID = 0x2,
642 }; 654 };
643 // Runs a test inside a harness that opens DevTools on a shell window. 655 // Runs a test inside a harness that opens DevTools on a shell window.
644 void RunTestWithDevTools(const char* name, int test_flags); 656 void RunTestWithDevTools(const char* name, int test_flags);
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 986
975 while (!ContainsKey(opener_app_ids_, file_manager->id())) { 987 while (!ContainsKey(opener_app_ids_, file_manager->id())) {
976 content::RunAllPendingInMessageLoop(); 988 content::RunAllPendingInMessageLoop();
977 } 989 }
978 } 990 }
979 991
980 #endif // defined(OS_CHROMEOS) 992 #endif // defined(OS_CHROMEOS)
981 993
982 994
983 } // namespace extensions 995 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/app_window/app_window_api.cc ('k') | chrome/browser/extensions/shell_window_geometry_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698