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

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

Issue 468913006: Added extension macro checks for android plugin files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: #ifdef'ed out entire GetExtensionInfoMap function Created 6 years, 4 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 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
(...skipping 27 matching lines...) Expand all
38 const base::FilePath& profile_directory, 38 const base::FilePath& profile_directory,
39 base::FilePath* file_path) OVERRIDE; 39 base::FilePath* file_path) OVERRIDE;
40 virtual void SetDebugPatterns(std::string debug_patterns) OVERRIDE; 40 virtual void SetDebugPatterns(std::string debug_patterns) OVERRIDE;
41 virtual bool URLMatchesDebugPatterns(const GURL& manifest_url) OVERRIDE; 41 virtual bool URLMatchesDebugPatterns(const GURL& manifest_url) OVERRIDE;
42 virtual content::BrowserPpapiHost::OnKeepaliveCallback 42 virtual content::BrowserPpapiHost::OnKeepaliveCallback
43 GetOnKeepaliveCallback() OVERRIDE; 43 GetOnKeepaliveCallback() OVERRIDE;
44 virtual bool IsNonSfiModeAllowed(const base::FilePath& profile_directory, 44 virtual bool IsNonSfiModeAllowed(const base::FilePath& profile_directory,
45 const GURL& manifest_url) OVERRIDE; 45 const GURL& manifest_url) OVERRIDE;
46 46
47 private: 47 private:
48 #if defined(ENABLE_EXTENSIONS)
48 scoped_refptr<extensions::InfoMap> GetExtensionInfoMap( 49 scoped_refptr<extensions::InfoMap> GetExtensionInfoMap(
49 const base::FilePath& profile_directory); 50 const base::FilePath& profile_directory);
51 #endif
52
50 ProfileManager* profile_manager_; 53 ProfileManager* profile_manager_;
51 std::vector<URLPattern> debug_patterns_; 54 std::vector<URLPattern> debug_patterns_;
52 bool inverse_debug_patterns_; 55 bool inverse_debug_patterns_;
53 std::set<std::string> allowed_nonsfi_origins_; 56 std::set<std::string> allowed_nonsfi_origins_;
54 DISALLOW_COPY_AND_ASSIGN(NaClBrowserDelegateImpl); 57 DISALLOW_COPY_AND_ASSIGN(NaClBrowserDelegateImpl);
55 }; 58 };
56 59
57 60
58 #endif // CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_ 61 #endif // CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/nacl_host/nacl_browser_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698