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

Side by Side Diff: chrome/browser/component_updater/npapi_flash_component_installer.cc

Issue 10933044: Move chrome/browser/plugin_* to chrome/browser/plugins/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@remove_plugin_group
Patch Set: . Created 8 years, 3 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 (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/component_updater/flash_component_installer.h" 5 #include "chrome/browser/component_updater/flash_component_installer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/browser/component_updater/component_updater_service.h" 18 #include "chrome/browser/component_updater/component_updater_service.h"
19 #include "chrome/browser/plugin_prefs.h" 19 #include "chrome/browser/plugins/plugin_prefs.h"
20 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
21 #include "content/public/browser/browser_thread.h" 21 #include "content/public/browser/browser_thread.h"
22 #include "content/public/browser/plugin_service.h" 22 #include "content/public/browser/plugin_service.h"
23 #include "webkit/plugins/webplugininfo.h" 23 #include "webkit/plugins/webplugininfo.h"
24 24
25 using content::BrowserThread; 25 using content::BrowserThread;
26 using content::PluginService; 26 using content::PluginService;
27 27
28 namespace { 28 namespace {
29 29
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // are loaded. 215 // are loaded.
216 BrowserThread::PostDelayedTask( 216 BrowserThread::PostDelayedTask(
217 BrowserThread::FILE, 217 BrowserThread::FILE,
218 FROM_HERE, 218 FROM_HERE,
219 base::Bind(&PluginService::GetPlugins, 219 base::Bind(&PluginService::GetPlugins,
220 base::Unretained(PluginService::GetInstance()), 220 base::Unretained(PluginService::GetInstance()),
221 base::Bind(&StartFlashUpdateRegistration, cus)), 221 base::Bind(&StartFlashUpdateRegistration, cus)),
222 base::TimeDelta::FromSeconds(8)); 222 base::TimeDelta::FromSeconds(8));
223 #endif 223 #endif
224 } 224 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698