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

Side by Side Diff: chrome/browser/nacl_host/nacl_browser_delegate_impl.h

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_ 5 #ifndef CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_
6 #define CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_ 6 #define CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "components/nacl/browser/nacl_browser_delegate.h" 13 #include "components/nacl/browser/nacl_browser_delegate.h"
14 #include "extensions/features/features.h"
14 15
15 #if defined(ENABLE_EXTENSIONS) 16 #if BUILDFLAG(ENABLE_EXTENSIONS)
16 #include "base/memory/ref_counted.h" 17 #include "base/memory/ref_counted.h"
17 #include "extensions/common/url_pattern.h" 18 #include "extensions/common/url_pattern.h"
18 19
19 namespace extensions { 20 namespace extensions {
20 class InfoMap; 21 class InfoMap;
21 } 22 }
22 #endif 23 #endif
23 24
24 class ProfileManager; 25 class ProfileManager;
25 26
(...skipping 17 matching lines...) Expand all
43 const base::FilePath& profile_directory, 44 const base::FilePath& profile_directory,
44 base::FilePath* file_path) override; 45 base::FilePath* file_path) override;
45 void SetDebugPatterns(const std::string& debug_patterns) override; 46 void SetDebugPatterns(const std::string& debug_patterns) override;
46 bool URLMatchesDebugPatterns(const GURL& manifest_url) override; 47 bool URLMatchesDebugPatterns(const GURL& manifest_url) override;
47 content::BrowserPpapiHost::OnKeepaliveCallback GetOnKeepaliveCallback() 48 content::BrowserPpapiHost::OnKeepaliveCallback GetOnKeepaliveCallback()
48 override; 49 override;
49 bool IsNonSfiModeAllowed(const base::FilePath& profile_directory, 50 bool IsNonSfiModeAllowed(const base::FilePath& profile_directory,
50 const GURL& manifest_url) override; 51 const GURL& manifest_url) override;
51 52
52 private: 53 private:
53 #if defined(ENABLE_EXTENSIONS) 54 #if BUILDFLAG(ENABLE_EXTENSIONS)
54 scoped_refptr<extensions::InfoMap> GetExtensionInfoMap( 55 scoped_refptr<extensions::InfoMap> GetExtensionInfoMap(
55 const base::FilePath& profile_directory); 56 const base::FilePath& profile_directory);
56 std::vector<URLPattern> debug_patterns_; 57 std::vector<URLPattern> debug_patterns_;
57 #endif 58 #endif
58 59
59 ProfileManager* profile_manager_; 60 ProfileManager* profile_manager_;
60 bool inverse_debug_patterns_; 61 bool inverse_debug_patterns_;
61 std::set<std::string> allowed_nonsfi_origins_; 62 std::set<std::string> allowed_nonsfi_origins_;
62 DISALLOW_COPY_AND_ASSIGN(NaClBrowserDelegateImpl); 63 DISALLOW_COPY_AND_ASSIGN(NaClBrowserDelegateImpl);
63 }; 64 };
64 65
65 66
66 #endif // CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_ 67 #endif // CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698