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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 #include "chrome/browser/ui/sync/sync_promo_ui.h" 83 #include "chrome/browser/ui/sync/sync_promo_ui.h"
84 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" 84 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
85 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 85 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
86 #include "chrome/browser/validation_message_message_filter.h" 86 #include "chrome/browser/validation_message_message_filter.h"
87 #include "chrome/common/chrome_constants.h" 87 #include "chrome/common/chrome_constants.h"
88 #include "chrome/common/chrome_paths.h" 88 #include "chrome/common/chrome_paths.h"
89 #include "chrome/common/chrome_switches.h" 89 #include "chrome/common/chrome_switches.h"
90 #include "chrome/common/chrome_version_info.h" 90 #include "chrome/common/chrome_version_info.h"
91 #include "chrome/common/env_vars.h" 91 #include "chrome/common/env_vars.h"
92 #include "chrome/common/extensions/extension_process_policy.h" 92 #include "chrome/common/extensions/extension_process_policy.h"
93 #include "chrome/common/extensions/extension_set.h"
94 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" 93 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
95 #include "chrome/common/extensions/permissions/socket_permission.h" 94 #include "chrome/common/extensions/permissions/socket_permission.h"
96 #include "chrome/common/extensions/web_accessible_resources_handler.h" 95 #include "chrome/common/extensions/web_accessible_resources_handler.h"
97 #include "chrome/common/logging_chrome.h" 96 #include "chrome/common/logging_chrome.h"
98 #include "chrome/common/pepper_permission_util.h" 97 #include "chrome/common/pepper_permission_util.h"
99 #include "chrome/common/pref_names.h" 98 #include "chrome/common/pref_names.h"
100 #include "chrome/common/render_messages.h" 99 #include "chrome/common/render_messages.h"
101 #include "chrome/common/url_constants.h" 100 #include "chrome/common/url_constants.h"
102 #include "chrome/installer/util/google_update_settings.h" 101 #include "chrome/installer/util/google_update_settings.h"
103 #include "chromeos/chromeos_constants.h" 102 #include "chromeos/chromeos_constants.h"
(...skipping 17 matching lines...) Expand all
121 #include "content/public/browser/web_contents.h" 120 #include "content/public/browser/web_contents.h"
122 #include "content/public/browser/web_contents_view.h" 121 #include "content/public/browser/web_contents_view.h"
123 #include "content/public/common/child_process_host.h" 122 #include "content/public/common/child_process_host.h"
124 #include "content/public/common/content_descriptors.h" 123 #include "content/public/common/content_descriptors.h"
125 #include "content/public/common/url_utils.h" 124 #include "content/public/common/url_utils.h"
126 #include "extensions/browser/info_map.h" 125 #include "extensions/browser/info_map.h"
127 #include "extensions/browser/process_manager.h" 126 #include "extensions/browser/process_manager.h"
128 #include "extensions/browser/view_type_utils.h" 127 #include "extensions/browser/view_type_utils.h"
129 #include "extensions/common/constants.h" 128 #include "extensions/common/constants.h"
130 #include "extensions/common/extension.h" 129 #include "extensions/common/extension.h"
130 #include "extensions/common/extension_set.h"
131 #include "extensions/common/manifest_handlers/background_info.h" 131 #include "extensions/common/manifest_handlers/background_info.h"
132 #include "extensions/common/manifest_handlers/shared_module_info.h" 132 #include "extensions/common/manifest_handlers/shared_module_info.h"
133 #include "extensions/common/permissions/permissions_data.h" 133 #include "extensions/common/permissions/permissions_data.h"
134 #include "extensions/common/switches.h" 134 #include "extensions/common/switches.h"
135 #include "grit/generated_resources.h" 135 #include "grit/generated_resources.h"
136 #include "grit/ui_resources.h" 136 #include "grit/ui_resources.h"
137 #include "net/base/mime_util.h" 137 #include "net/base/mime_util.h"
138 #include "net/cookies/canonical_cookie.h" 138 #include "net/cookies/canonical_cookie.h"
139 #include "net/cookies/cookie_options.h" 139 #include "net/cookies/cookie_options.h"
140 #include "net/ssl/ssl_cert_request_info.h" 140 #include "net/ssl/ssl_cert_request_info.h"
(...skipping 2498 matching lines...) Expand 10 before | Expand all | Expand 10 after
2639 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, 2639 return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
2640 allowed_file_handle_origins_) || 2640 allowed_file_handle_origins_) ||
2641 IsHostAllowedByCommandLine(url, extension_set, 2641 IsHostAllowedByCommandLine(url, extension_set,
2642 switches::kAllowNaClFileHandleAPI); 2642 switches::kAllowNaClFileHandleAPI);
2643 #else 2643 #else
2644 return false; 2644 return false;
2645 #endif 2645 #endif
2646 } 2646 }
2647 2647
2648 } // namespace chrome 2648 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698