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

Side by Side Diff: chrome/browser/extensions/test_extension_environment.h

Issue 1243033003: App Info: `View in Webstore` closes before navigating (not after) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Likely fix for CrOS Created 5 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/extensions/test_extension_environment.cc » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_
6 #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_ 6 #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 10
11 #if defined(OS_CHROMEOS)
12 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
13 #include "chrome/browser/chromeos/settings/cros_settings.h"
14 #include "chrome/browser/chromeos/settings/device_settings_service.h"
15 #endif
16
17 #if defined(OS_WIN) 11 #if defined(OS_WIN)
18 #include "ui/base/win/scoped_ole_initializer.h" 12 #include "ui/base/win/scoped_ole_initializer.h"
19 #endif 13 #endif
20 14
21 class ExtensionService; 15 class ExtensionService;
22 class TestingProfile; 16 class TestingProfile;
23 17
24 namespace base { 18 namespace base {
25 class Value; 19 class Value;
26 } 20 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 // it gets added to the ExtensionService in |profile|. 76 // it gets added to the ExtensionService in |profile|.
83 scoped_refptr<Extension> MakePackagedApp(const std::string& id, bool install); 77 scoped_refptr<Extension> MakePackagedApp(const std::string& id, bool install);
84 78
85 // Returns a test web contents that has a tab id. 79 // Returns a test web contents that has a tab id.
86 scoped_ptr<content::WebContents> MakeTab() const; 80 scoped_ptr<content::WebContents> MakeTab() const;
87 81
88 // Deletes the testing profile to test profile teardown. 82 // Deletes the testing profile to test profile teardown.
89 void DeleteProfile(); 83 void DeleteProfile();
90 84
91 private: 85 private:
86 class ChromeOSEnv;
87
88 void Init();
89
92 scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_; 90 scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_;
93 91 scoped_ptr<ChromeOSEnv> chromeos_env_;
94 #if defined(OS_CHROMEOS)
95 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
96 chromeos::ScopedTestCrosSettings test_cros_settings_;
97 chromeos::ScopedTestUserManager test_user_manager_;
98 #endif
99 92
100 #if defined(OS_WIN) 93 #if defined(OS_WIN)
101 ui::ScopedOleInitializer ole_initializer_; 94 ui::ScopedOleInitializer ole_initializer_;
102 #endif 95 #endif
103 scoped_ptr<TestingProfile> profile_; 96 scoped_ptr<TestingProfile> profile_;
104 ExtensionService* extension_service_; 97 ExtensionService* extension_service_;
105 98
106 DISALLOW_COPY_AND_ASSIGN(TestExtensionEnvironment); 99 DISALLOW_COPY_AND_ASSIGN(TestExtensionEnvironment);
107 }; 100 };
108 101
109 } // namespace extensions 102 } // namespace extensions
110 103
111 #endif // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_ 104 #endif // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/test_extension_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698