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

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

Issue 2206693002: Improve settings override bubble to indicate policy installed extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac implementation with test Created 4 years, 2 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 enum InstallState { 45 enum InstallState {
46 INSTALL_FAILED, 46 INSTALL_FAILED,
47 INSTALL_UPDATED, 47 INSTALL_UPDATED,
48 INSTALL_NEW, 48 INSTALL_NEW,
49 INSTALL_WITHOUT_LOAD, 49 INSTALL_WITHOUT_LOAD,
50 }; 50 };
51 51
52 const Extension* PackAndInstallCRX(const base::FilePath& dir_path, 52 const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
53 const base::FilePath& pem_path, 53 const base::FilePath& pem_path,
54 InstallState install_state, 54 InstallState install_state,
55 int creation_flags); 55 int creation_flags,
56 Manifest::Location install_location);
56 const Extension* PackAndInstallCRX(const base::FilePath& dir_path, 57 const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
57 const base::FilePath& pem_path, 58 const base::FilePath& pem_path,
58 InstallState install_state); 59 InstallState install_state);
59 const Extension* PackAndInstallCRX(const base::FilePath& dir_path, 60 const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
60 InstallState install_state); 61 InstallState install_state);
61 62 const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
63 Manifest::Location install_location,
64 InstallState install_state);
62 const Extension* InstallCRX(const base::FilePath& path, 65 const Extension* InstallCRX(const base::FilePath& path,
63 InstallState install_state, 66 InstallState install_state,
64 int creation_flags, 67 int creation_flags,
65 const std::string& expected_old_name); 68 const std::string& expected_old_name);
66 const Extension* InstallCRX(const base::FilePath& path, 69 const Extension* InstallCRX(const base::FilePath& path,
67 InstallState install_state, 70 InstallState install_state,
68 int creation_flags); 71 int creation_flags);
69 const Extension* InstallCRX(const base::FilePath& path, 72 const Extension* InstallCRX(const base::FilePath& path,
70 InstallState install_state); 73 InstallState install_state);
71 const Extension* InstallCRXFromWebStore(const base::FilePath& path, 74 const Extension* InstallCRXFromWebStore(const base::FilePath& path,
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 146
144 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> 147 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
145 registry_observer_; 148 registry_observer_;
146 149
147 DISALLOW_COPY_AND_ASSIGN(ExtensionServiceTestWithInstall); 150 DISALLOW_COPY_AND_ASSIGN(ExtensionServiceTestWithInstall);
148 }; 151 };
149 152
150 } // namespace extensions 153 } // namespace extensions
151 154
152 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_ 155 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698