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

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

Issue 1554583002: Revert of Change extension icon load errors to warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge issues Created 4 years, 11 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 const Extension* PackAndInstallCRX(const base::FilePath& dir_path, 56 const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
57 const base::FilePath& pem_path, 57 const base::FilePath& pem_path,
58 InstallState install_state); 58 InstallState install_state);
59 const Extension* PackAndInstallCRX(const base::FilePath& dir_path, 59 const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
60 InstallState install_state); 60 InstallState install_state);
61 const Extension* PackAndInstallCRXWithLocation(const base::FilePath& dir_path,
62 Manifest::Location location,
63 InstallState install_state);
64 61
65 const Extension* InstallCRX(const base::FilePath& path, 62 const Extension* InstallCRX(const base::FilePath& path,
66 InstallState install_state, 63 InstallState install_state,
67 int creation_flags, 64 int creation_flags,
68 const std::string& expected_old_name); 65 const std::string& expected_old_name);
69 const Extension* InstallCRX(const base::FilePath& path, 66 const Extension* InstallCRX(const base::FilePath& path,
70 InstallState install_state, 67 InstallState install_state,
71 int creation_flags); 68 int creation_flags);
72 const Extension* InstallCRX(const base::FilePath& path, 69 const Extension* InstallCRX(const base::FilePath& path,
73 InstallState install_state); 70 InstallState install_state);
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 143
147 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> 144 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
148 registry_observer_; 145 registry_observer_;
149 146
150 DISALLOW_COPY_AND_ASSIGN(ExtensionServiceTestWithInstall); 147 DISALLOW_COPY_AND_ASSIGN(ExtensionServiceTestWithInstall);
151 }; 148 };
152 149
153 } // namespace extensions 150 } // namespace extensions
154 151
155 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_ 152 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698