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

Side by Side Diff: trunk/src/chrome/browser/extensions/extension_service.cc

Issue 15292007: Revert 200828 "Move webkit/fileapi/file_system_mount_point_provi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "chrome/browser/extensions/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <set> 9 #include <set>
10 10
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 #include "googleurl/src/gurl.h" 108 #include "googleurl/src/gurl.h"
109 #include "grit/generated_resources.h" 109 #include "grit/generated_resources.h"
110 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 110 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
111 #include "sync/api/sync_change.h" 111 #include "sync/api/sync_change.h"
112 #include "sync/api/sync_error_factory.h" 112 #include "sync/api/sync_error_factory.h"
113 #include "webkit/database/database_tracker.h" 113 #include "webkit/database/database_tracker.h"
114 #include "webkit/database/database_util.h" 114 #include "webkit/database/database_util.h"
115 115
116 #if defined(OS_CHROMEOS) 116 #if defined(OS_CHROMEOS)
117 #include "chrome/browser/chromeos/extensions/install_limiter.h" 117 #include "chrome/browser/chromeos/extensions/install_limiter.h"
118 #include "webkit/browser/fileapi/file_system_mount_point_provider.h"
119 #include "webkit/fileapi/file_system_context.h" 118 #include "webkit/fileapi/file_system_context.h"
119 #include "webkit/fileapi/file_system_mount_point_provider.h"
120 #endif 120 #endif
121 121
122 using content::BrowserContext; 122 using content::BrowserContext;
123 using content::BrowserThread; 123 using content::BrowserThread;
124 using content::DevToolsAgentHost; 124 using content::DevToolsAgentHost;
125 using content::PluginService; 125 using content::PluginService;
126 using extensions::CrxInstaller; 126 using extensions::CrxInstaller;
127 using extensions::Extension; 127 using extensions::Extension;
128 using extensions::ExtensionIdSet; 128 using extensions::ExtensionIdSet;
129 using extensions::ExtensionInfo; 129 using extensions::ExtensionInfo;
(...skipping 2984 matching lines...) Expand 10 before | Expand all | Expand 10 after
3114 } 3114 }
3115 3115
3116 void ExtensionService::AddUpdateObserver(extensions::UpdateObserver* observer) { 3116 void ExtensionService::AddUpdateObserver(extensions::UpdateObserver* observer) {
3117 update_observers_.AddObserver(observer); 3117 update_observers_.AddObserver(observer);
3118 } 3118 }
3119 3119
3120 void ExtensionService::RemoveUpdateObserver( 3120 void ExtensionService::RemoveUpdateObserver(
3121 extensions::UpdateObserver* observer) { 3121 extensions::UpdateObserver* observer) {
3122 update_observers_.RemoveObserver(observer); 3122 update_observers_.RemoveObserver(observer);
3123 } 3123 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698