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

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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
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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 #include "chrome/browser/upgrade_detector.h" 141 #include "chrome/browser/upgrade_detector.h"
142 #include "chrome/browser/web_applications/web_app.h" 142 #include "chrome/browser/web_applications/web_app.h"
143 #include "chrome/common/chrome_constants.h" 143 #include "chrome/common/chrome_constants.h"
144 #include "chrome/common/chrome_switches.h" 144 #include "chrome/common/chrome_switches.h"
145 #include "chrome/common/custom_handlers/protocol_handler.h" 145 #include "chrome/common/custom_handlers/protocol_handler.h"
146 #include "chrome/common/net/url_fixer_upper.h" 146 #include "chrome/common/net/url_fixer_upper.h"
147 #include "chrome/common/pref_names.h" 147 #include "chrome/common/pref_names.h"
148 #include "chrome/common/profiling.h" 148 #include "chrome/common/profiling.h"
149 #include "chrome/common/search_types.h" 149 #include "chrome/common/search_types.h"
150 #include "chrome/common/url_constants.h" 150 #include "chrome/common/url_constants.h"
151 #include "components/bookmarks/core/browser/bookmark_model.h" 151 #include "components/bookmarks/browser/bookmark_model.h"
152 #include "components/bookmarks/core/browser/bookmark_utils.h" 152 #include "components/bookmarks/browser/bookmark_utils.h"
153 #include "components/startup_metric_utils/startup_metric_utils.h" 153 #include "components/startup_metric_utils/startup_metric_utils.h"
154 #include "components/web_modal/web_contents_modal_dialog_manager.h" 154 #include "components/web_modal/web_contents_modal_dialog_manager.h"
155 #include "content/public/browser/devtools_manager.h" 155 #include "content/public/browser/devtools_manager.h"
156 #include "content/public/browser/download_item.h" 156 #include "content/public/browser/download_item.h"
157 #include "content/public/browser/download_manager.h" 157 #include "content/public/browser/download_manager.h"
158 #include "content/public/browser/interstitial_page.h" 158 #include "content/public/browser/interstitial_page.h"
159 #include "content/public/browser/invalidate_type.h" 159 #include "content/public/browser/invalidate_type.h"
160 #include "content/public/browser/navigation_controller.h" 160 #include "content/public/browser/navigation_controller.h"
161 #include "content/public/browser/navigation_entry.h" 161 #include "content/public/browser/navigation_entry.h"
162 #include "content/public/browser/notification_details.h" 162 #include "content/public/browser/notification_details.h"
(...skipping 2256 matching lines...) Expand 10 before | Expand all | Expand 10 after
2419 if (contents && !allow_js_access) { 2419 if (contents && !allow_js_access) {
2420 contents->web_contents()->GetController().LoadURL( 2420 contents->web_contents()->GetController().LoadURL(
2421 target_url, 2421 target_url,
2422 content::Referrer(), 2422 content::Referrer(),
2423 content::PAGE_TRANSITION_LINK, 2423 content::PAGE_TRANSITION_LINK,
2424 std::string()); // No extra headers. 2424 std::string()); // No extra headers.
2425 } 2425 }
2426 2426
2427 return contents != NULL; 2427 return contents != NULL;
2428 } 2428 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698