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

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

Issue 10796033: Move files related to registry-controlled domains into a new net/base/registry_controlled_domains/ … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Update checkout Created 8 years, 5 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
« no previous file with comments | « chrome/browser/cookies_tree_model.cc ('k') | chrome/browser/google/google_util.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/extensions/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #include "content/public/browser/browser_thread.h" 94 #include "content/public/browser/browser_thread.h"
95 #include "content/public/browser/devtools_agent_host_registry.h" 95 #include "content/public/browser/devtools_agent_host_registry.h"
96 #include "content/public/browser/devtools_manager.h" 96 #include "content/public/browser/devtools_manager.h"
97 #include "content/public/browser/notification_service.h" 97 #include "content/public/browser/notification_service.h"
98 #include "content/public/browser/notification_types.h" 98 #include "content/public/browser/notification_types.h"
99 #include "content/public/browser/plugin_service.h" 99 #include "content/public/browser/plugin_service.h"
100 #include "content/public/browser/render_process_host.h" 100 #include "content/public/browser/render_process_host.h"
101 #include "content/public/common/pepper_plugin_info.h" 101 #include "content/public/common/pepper_plugin_info.h"
102 #include "googleurl/src/gurl.h" 102 #include "googleurl/src/gurl.h"
103 #include "grit/generated_resources.h" 103 #include "grit/generated_resources.h"
104 #include "net/base/registry_controlled_domain.h" 104 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
105 #include "sync/api/sync_change.h" 105 #include "sync/api/sync_change.h"
106 #include "sync/api/sync_error_factory.h" 106 #include "sync/api/sync_error_factory.h"
107 #include "ui/base/l10n/l10n_util.h" 107 #include "ui/base/l10n/l10n_util.h"
108 #include "webkit/database/database_tracker.h" 108 #include "webkit/database/database_tracker.h"
109 #include "webkit/database/database_util.h" 109 #include "webkit/database/database_util.h"
110 110
111 #if defined(OS_CHROMEOS) 111 #if defined(OS_CHROMEOS)
112 #include "chrome/browser/chromeos/cros/cros_library.h" 112 #include "chrome/browser/chromeos/cros/cros_library.h"
113 #include "chrome/browser/chromeos/extensions/bluetooth_event_router.h" 113 #include "chrome/browser/chromeos/extensions/bluetooth_event_router.h"
114 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h" 114 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
(...skipping 2421 matching lines...) Expand 10 before | Expand all | Expand 10 after
2536 2536
2537 ExtensionService::NaClModuleInfoList::iterator 2537 ExtensionService::NaClModuleInfoList::iterator
2538 ExtensionService::FindNaClModule(const GURL& url) { 2538 ExtensionService::FindNaClModule(const GURL& url) {
2539 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); 2539 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
2540 iter != nacl_module_list_.end(); ++iter) { 2540 iter != nacl_module_list_.end(); ++iter) {
2541 if (iter->url == url) 2541 if (iter->url == url)
2542 return iter; 2542 return iter;
2543 } 2543 }
2544 return nacl_module_list_.end(); 2544 return nacl_module_list_.end();
2545 } 2545 }
OLDNEW
« no previous file with comments | « chrome/browser/cookies_tree_model.cc ('k') | chrome/browser/google/google_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698