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

Side by Side Diff: chrome/browser/plugins/plugin_prefs.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « chrome/browser/plugins/plugin_prefs.h ('k') | chrome/browser/plugins/plugin_prefs_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/plugins/plugin_prefs.h" 5 #include "chrome/browser/plugins/plugin_prefs.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/prefs/scoped_user_pref_update.h"
17 #include "base/single_thread_task_runner.h" 16 #include "base/single_thread_task_runner.h"
18 #include "base/strings/pattern.h" 17 #include "base/strings/pattern.h"
19 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
20 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
21 #include "base/thread_task_runner_handle.h" 20 #include "base/thread_task_runner_handle.h"
22 #include "base/values.h" 21 #include "base/values.h"
23 #include "build/build_config.h" 22 #include "build/build_config.h"
24 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
25 #include "chrome/browser/chrome_notification_types.h" 24 #include "chrome/browser/chrome_notification_types.h"
26 #include "chrome/browser/plugins/plugin_installer.h" 25 #include "chrome/browser/plugins/plugin_installer.h"
27 #include "chrome/browser/plugins/plugin_metadata.h" 26 #include "chrome/browser/plugins/plugin_metadata.h"
28 #include "chrome/browser/plugins/plugin_prefs_factory.h" 27 #include "chrome/browser/plugins/plugin_prefs_factory.h"
29 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
30 #include "chrome/common/chrome_constants.h" 29 #include "chrome/common/chrome_constants.h"
31 #include "chrome/common/chrome_paths.h" 30 #include "chrome/common/chrome_paths.h"
32 #include "chrome/common/chrome_switches.h" 31 #include "chrome/common/chrome_switches.h"
33 #include "chrome/common/pref_names.h" 32 #include "chrome/common/pref_names.h"
34 #include "components/keyed_service/core/keyed_service.h" 33 #include "components/keyed_service/core/keyed_service.h"
34 #include "components/prefs/scoped_user_pref_update.h"
35 #include "content/public/browser/browser_thread.h" 35 #include "content/public/browser/browser_thread.h"
36 #include "content/public/browser/notification_service.h" 36 #include "content/public/browser/notification_service.h"
37 #include "content/public/browser/plugin_service.h" 37 #include "content/public/browser/plugin_service.h"
38 #include "content/public/common/webplugininfo.h" 38 #include "content/public/common/webplugininfo.h"
39 39
40 #if !defined(DISABLE_NACL) 40 #if !defined(DISABLE_NACL)
41 #include "components/nacl/common/nacl_constants.h" 41 #include "components/nacl/common/nacl_constants.h"
42 #endif 42 #endif
43 43
44 using content::BrowserThread; 44 using content::BrowserThread;
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 } 511 }
512 } 512 }
513 513
514 void PluginPrefs::NotifyPluginStatusChanged() { 514 void PluginPrefs::NotifyPluginStatusChanged() {
515 DCHECK_CURRENTLY_ON(BrowserThread::UI); 515 DCHECK_CURRENTLY_ON(BrowserThread::UI);
516 content::NotificationService::current()->Notify( 516 content::NotificationService::current()->Notify(
517 chrome::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED, 517 chrome::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED,
518 content::Source<Profile>(profile_), 518 content::Source<Profile>(profile_),
519 content::NotificationService::NoDetails()); 519 content::NotificationService::NoDetails());
520 } 520 }
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_prefs.h ('k') | chrome/browser/plugins/plugin_prefs_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698