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

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

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 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
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 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 #include "chrome/common/pref_names.h" 153 #include "chrome/common/pref_names.h"
154 #include "chrome/common/profiling.h" 154 #include "chrome/common/profiling.h"
155 #include "chrome/common/search/search_types.h" 155 #include "chrome/common/search/search_types.h"
156 #include "chrome/common/url_constants.h" 156 #include "chrome/common/url_constants.h"
157 #include "chrome/grit/chromium_strings.h" 157 #include "chrome/grit/chromium_strings.h"
158 #include "chrome/grit/generated_resources.h" 158 #include "chrome/grit/generated_resources.h"
159 #include "chrome/grit/locale_settings.h" 159 #include "chrome/grit/locale_settings.h"
160 #include "components/bookmarks/browser/bookmark_model.h" 160 #include "components/bookmarks/browser/bookmark_model.h"
161 #include "components/bookmarks/browser/bookmark_utils.h" 161 #include "components/bookmarks/browser/bookmark_utils.h"
162 #include "components/bookmarks/common/bookmark_pref_names.h" 162 #include "components/bookmarks/common/bookmark_pref_names.h"
163 #include "components/browser_sync/browser/profile_sync_service.h" 163 #include "components/browser_sync/profile_sync_service.h"
164 #include "components/bubble/bubble_controller.h" 164 #include "components/bubble/bubble_controller.h"
165 #include "components/content_settings/core/browser/host_content_settings_map.h" 165 #include "components/content_settings/core/browser/host_content_settings_map.h"
166 #include "components/favicon/content/content_favicon_driver.h" 166 #include "components/favicon/content/content_favicon_driver.h"
167 #include "components/history/core/browser/top_sites.h" 167 #include "components/history/core/browser/top_sites.h"
168 #include "components/prefs/pref_service.h" 168 #include "components/prefs/pref_service.h"
169 #include "components/search/search.h" 169 #include "components/search/search.h"
170 #include "components/security_state/security_state_model.h" 170 #include "components/security_state/security_state_model.h"
171 #include "components/sessions/core/session_types.h" 171 #include "components/sessions/core/session_types.h"
172 #include "components/sessions/core/tab_restore_service.h" 172 #include "components/sessions/core/tab_restore_service.h"
173 #include "components/startup_metric_utils/browser/startup_metric_utils.h" 173 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
(...skipping 2390 matching lines...) Expand 10 before | Expand all | Expand 10 after
2564 if (contents && !allow_js_access) { 2564 if (contents && !allow_js_access) {
2565 contents->web_contents()->GetController().LoadURL( 2565 contents->web_contents()->GetController().LoadURL(
2566 target_url, 2566 target_url,
2567 content::Referrer(), 2567 content::Referrer(),
2568 ui::PAGE_TRANSITION_LINK, 2568 ui::PAGE_TRANSITION_LINK,
2569 std::string()); // No extra headers. 2569 std::string()); // No extra headers.
2570 } 2570 }
2571 2571
2572 return contents != NULL; 2572 return contents != NULL;
2573 } 2573 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/avatar_button_error_controller.cc ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698