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

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

Issue 1361613002: Move all core files in //components/sessions into core/ subdir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.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 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 #include "chrome/grit/chromium_strings.h" 154 #include "chrome/grit/chromium_strings.h"
155 #include "chrome/grit/generated_resources.h" 155 #include "chrome/grit/generated_resources.h"
156 #include "chrome/grit/locale_settings.h" 156 #include "chrome/grit/locale_settings.h"
157 #include "components/app_modal/javascript_dialog_manager.h" 157 #include "components/app_modal/javascript_dialog_manager.h"
158 #include "components/bookmarks/browser/bookmark_model.h" 158 #include "components/bookmarks/browser/bookmark_model.h"
159 #include "components/bookmarks/browser/bookmark_utils.h" 159 #include "components/bookmarks/browser/bookmark_utils.h"
160 #include "components/content_settings/core/browser/host_content_settings_map.h" 160 #include "components/content_settings/core/browser/host_content_settings_map.h"
161 #include "components/favicon/content/content_favicon_driver.h" 161 #include "components/favicon/content/content_favicon_driver.h"
162 #include "components/history/core/browser/top_sites.h" 162 #include "components/history/core/browser/top_sites.h"
163 #include "components/search/search.h" 163 #include "components/search/search.h"
164 #include "components/sessions/core/session_types.h"
164 #include "components/sessions/core/tab_restore_service.h" 165 #include "components/sessions/core/tab_restore_service.h"
165 #include "components/sessions/session_types.h"
166 #include "components/startup_metric_utils/startup_metric_utils.h" 166 #include "components/startup_metric_utils/startup_metric_utils.h"
167 #include "components/translate/core/browser/language_state.h" 167 #include "components/translate/core/browser/language_state.h"
168 #include "components/ui/zoom/zoom_controller.h" 168 #include "components/ui/zoom/zoom_controller.h"
169 #include "components/web_modal/web_contents_modal_dialog_manager.h" 169 #include "components/web_modal/web_contents_modal_dialog_manager.h"
170 #include "content/public/browser/devtools_agent_host.h" 170 #include "content/public/browser/devtools_agent_host.h"
171 #include "content/public/browser/interstitial_page.h" 171 #include "content/public/browser/interstitial_page.h"
172 #include "content/public/browser/invalidate_type.h" 172 #include "content/public/browser/invalidate_type.h"
173 #include "content/public/browser/navigation_controller.h" 173 #include "content/public/browser/navigation_controller.h"
174 #include "content/public/browser/navigation_entry.h" 174 #include "content/public/browser/navigation_entry.h"
175 #include "content/public/browser/notification_details.h" 175 #include "content/public/browser/notification_details.h"
(...skipping 2519 matching lines...) Expand 10 before | Expand all | Expand 10 after
2695 if (contents && !allow_js_access) { 2695 if (contents && !allow_js_access) {
2696 contents->web_contents()->GetController().LoadURL( 2696 contents->web_contents()->GetController().LoadURL(
2697 target_url, 2697 target_url,
2698 content::Referrer(), 2698 content::Referrer(),
2699 ui::PAGE_TRANSITION_LINK, 2699 ui::PAGE_TRANSITION_LINK,
2700 std::string()); // No extra headers. 2700 std::string()); // No extra headers.
2701 } 2701 }
2702 2702
2703 return contents != NULL; 2703 return contents != NULL;
2704 } 2704 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698