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

Side by Side Diff: chrome/browser/policy/chrome_browser_policy_connector.h

Issue 1158423003: Disable NPAPI support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove enterprise policy override based on revert of 26d09db Created 5 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_POLICY_CHROME_BROWSER_POLICY_CONNECTOR_H_ 5 #ifndef CHROME_BROWSER_POLICY_CHROME_BROWSER_POLICY_CONNECTOR_H_
6 #define CHROME_BROWSER_POLICY_CHROME_BROWSER_POLICY_CONNECTOR_H_ 6 #define CHROME_BROWSER_POLICY_CHROME_BROWSER_POLICY_CONNECTOR_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "components/policy/core/browser/browser_policy_connector.h" 10 #include "components/policy/core/browser/browser_policy_connector.h"
(...skipping 22 matching lines...) Expand all
33 33
34 ~ChromeBrowserPolicyConnector() override; 34 ~ChromeBrowserPolicyConnector() override;
35 35
36 void Init( 36 void Init(
37 PrefService* local_state, 37 PrefService* local_state,
38 scoped_refptr<net::URLRequestContextGetter> request_context) override; 38 scoped_refptr<net::URLRequestContextGetter> request_context) override;
39 39
40 private: 40 private:
41 ConfigurationPolicyProvider* CreatePlatformProvider(); 41 ConfigurationPolicyProvider* CreatePlatformProvider();
42 42
43 void AppendExtraFlagsPerPolicy();
Mattias Nissler (ping if slow) 2015/05/29 07:10:02 Remove this
Will Harris 2015/05/29 16:54:56 Done.
44
43 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserPolicyConnector); 45 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserPolicyConnector);
44 }; 46 };
45 47
46 } // namespace policy 48 } // namespace policy
47 49
48 #endif // CHROME_BROWSER_POLICY_CHROME_BROWSER_POLICY_CONNECTOR_H_ 50 #endif // CHROME_BROWSER_POLICY_CHROME_BROWSER_POLICY_CONNECTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698