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

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

Issue 670953006: Componentize HostContentSettingsMap and content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win64 suppress warnings Created 6 years, 1 month 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 19 matching lines...) Expand all
30 #include "chrome/app/chrome_command_ids.h" 30 #include "chrome/app/chrome_command_ids.h"
31 #include "chrome/browser/app_mode/app_mode_utils.h" 31 #include "chrome/browser/app_mode/app_mode_utils.h"
32 #include "chrome/browser/autofill/personal_data_manager_factory.h" 32 #include "chrome/browser/autofill/personal_data_manager_factory.h"
33 #include "chrome/browser/background/background_contents_service.h" 33 #include "chrome/browser/background/background_contents_service.h"
34 #include "chrome/browser/background/background_contents_service_factory.h" 34 #include "chrome/browser/background/background_contents_service_factory.h"
35 #include "chrome/browser/browser_process.h" 35 #include "chrome/browser/browser_process.h"
36 #include "chrome/browser/browser_shutdown.h" 36 #include "chrome/browser/browser_shutdown.h"
37 #include "chrome/browser/character_encoding.h" 37 #include "chrome/browser/character_encoding.h"
38 #include "chrome/browser/chrome_notification_types.h" 38 #include "chrome/browser/chrome_notification_types.h"
39 #include "chrome/browser/chrome_page_zoom.h" 39 #include "chrome/browser/chrome_page_zoom.h"
40 #include "chrome/browser/content_settings/host_content_settings_map.h"
41 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 40 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
42 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 41 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
43 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" 42 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
44 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_deleg ate.h" 43 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_deleg ate.h"
45 #include "chrome/browser/custom_handlers/register_protocol_handler_permission_re quest.h" 44 #include "chrome/browser/custom_handlers/register_protocol_handler_permission_re quest.h"
46 #include "chrome/browser/defaults.h" 45 #include "chrome/browser/defaults.h"
47 #include "chrome/browser/devtools/devtools_toggle_action.h" 46 #include "chrome/browser/devtools/devtools_toggle_action.h"
48 #include "chrome/browser/devtools/devtools_window.h" 47 #include "chrome/browser/devtools/devtools_window.h"
49 #include "chrome/browser/download/download_item_model.h" 48 #include "chrome/browser/download/download_item_model.h"
50 #include "chrome/browser/download/download_service.h" 49 #include "chrome/browser/download/download_service.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 #include "chrome/common/custom_handlers/protocol_handler.h" 147 #include "chrome/common/custom_handlers/protocol_handler.h"
149 #include "chrome/common/pref_names.h" 148 #include "chrome/common/pref_names.h"
150 #include "chrome/common/profiling.h" 149 #include "chrome/common/profiling.h"
151 #include "chrome/common/search_types.h" 150 #include "chrome/common/search_types.h"
152 #include "chrome/common/url_constants.h" 151 #include "chrome/common/url_constants.h"
153 #include "chrome/grit/chromium_strings.h" 152 #include "chrome/grit/chromium_strings.h"
154 #include "chrome/grit/generated_resources.h" 153 #include "chrome/grit/generated_resources.h"
155 #include "chrome/grit/locale_settings.h" 154 #include "chrome/grit/locale_settings.h"
156 #include "components/bookmarks/browser/bookmark_model.h" 155 #include "components/bookmarks/browser/bookmark_model.h"
157 #include "components/bookmarks/browser/bookmark_utils.h" 156 #include "components/bookmarks/browser/bookmark_utils.h"
157 #include "components/content_settings/core/browser/host_content_settings_map.h"
158 #include "components/google/core/browser/google_url_tracker.h" 158 #include "components/google/core/browser/google_url_tracker.h"
159 #include "components/search/search.h" 159 #include "components/search/search.h"
160 #include "components/startup_metric_utils/startup_metric_utils.h" 160 #include "components/startup_metric_utils/startup_metric_utils.h"
161 #include "components/web_modal/popup_manager.h" 161 #include "components/web_modal/popup_manager.h"
162 #include "components/web_modal/web_contents_modal_dialog_manager.h" 162 #include "components/web_modal/web_contents_modal_dialog_manager.h"
163 #include "content/public/browser/devtools_agent_host.h" 163 #include "content/public/browser/devtools_agent_host.h"
164 #include "content/public/browser/download_item.h" 164 #include "content/public/browser/download_item.h"
165 #include "content/public/browser/download_manager.h" 165 #include "content/public/browser/download_manager.h"
166 #include "content/public/browser/interstitial_page.h" 166 #include "content/public/browser/interstitial_page.h"
167 #include "content/public/browser/invalidate_type.h" 167 #include "content/public/browser/invalidate_type.h"
(...skipping 2333 matching lines...) Expand 10 before | Expand all | Expand 10 after
2501 if (contents && !allow_js_access) { 2501 if (contents && !allow_js_access) {
2502 contents->web_contents()->GetController().LoadURL( 2502 contents->web_contents()->GetController().LoadURL(
2503 target_url, 2503 target_url,
2504 content::Referrer(), 2504 content::Referrer(),
2505 ui::PAGE_TRANSITION_LINK, 2505 ui::PAGE_TRANSITION_LINK,
2506 std::string()); // No extra headers. 2506 std::string()); // No extra headers.
2507 } 2507 }
2508 2508
2509 return contents != NULL; 2509 return contents != NULL;
2510 } 2510 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698