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

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

Issue 735473002: Rename app_modal_dialogs dir to app_modal (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 #include "chrome/common/chrome_constants.h" 142 #include "chrome/common/chrome_constants.h"
143 #include "chrome/common/chrome_switches.h" 143 #include "chrome/common/chrome_switches.h"
144 #include "chrome/common/custom_handlers/protocol_handler.h" 144 #include "chrome/common/custom_handlers/protocol_handler.h"
145 #include "chrome/common/pref_names.h" 145 #include "chrome/common/pref_names.h"
146 #include "chrome/common/profiling.h" 146 #include "chrome/common/profiling.h"
147 #include "chrome/common/search_types.h" 147 #include "chrome/common/search_types.h"
148 #include "chrome/common/url_constants.h" 148 #include "chrome/common/url_constants.h"
149 #include "chrome/grit/chromium_strings.h" 149 #include "chrome/grit/chromium_strings.h"
150 #include "chrome/grit/generated_resources.h" 150 #include "chrome/grit/generated_resources.h"
151 #include "chrome/grit/locale_settings.h" 151 #include "chrome/grit/locale_settings.h"
152 #include "components/app_modal_dialogs/javascript_dialog_manager.h" 152 #include "components/app_modal/javascript_dialog_manager.h"
153 #include "components/bookmarks/browser/bookmark_model.h" 153 #include "components/bookmarks/browser/bookmark_model.h"
154 #include "components/bookmarks/browser/bookmark_utils.h" 154 #include "components/bookmarks/browser/bookmark_utils.h"
155 #include "components/content_settings/core/browser/host_content_settings_map.h" 155 #include "components/content_settings/core/browser/host_content_settings_map.h"
156 #include "components/google/core/browser/google_url_tracker.h" 156 #include "components/google/core/browser/google_url_tracker.h"
157 #include "components/search/search.h" 157 #include "components/search/search.h"
158 #include "components/sessions/session_types.h" 158 #include "components/sessions/session_types.h"
159 #include "components/startup_metric_utils/startup_metric_utils.h" 159 #include "components/startup_metric_utils/startup_metric_utils.h"
160 #include "components/web_modal/popup_manager.h" 160 #include "components/web_modal/popup_manager.h"
161 #include "components/web_modal/web_contents_modal_dialog_manager.h" 161 #include "components/web_modal/web_contents_modal_dialog_manager.h"
162 #include "content/public/browser/devtools_agent_host.h" 162 #include "content/public/browser/devtools_agent_host.h"
(...skipping 2334 matching lines...) Expand 10 before | Expand all | Expand 10 after
2497 if (contents && !allow_js_access) { 2497 if (contents && !allow_js_access) {
2498 contents->web_contents()->GetController().LoadURL( 2498 contents->web_contents()->GetController().LoadURL(
2499 target_url, 2499 target_url,
2500 content::Referrer(), 2500 content::Referrer(),
2501 ui::PAGE_TRANSITION_LINK, 2501 ui::PAGE_TRANSITION_LINK,
2502 std::string()); // No extra headers. 2502 std::string()); // No extra headers.
2503 } 2503 }
2504 2504
2505 return contents != NULL; 2505 return contents != NULL;
2506 } 2506 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698