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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/base_paths.h" 13 #include "base/base_paths.h"
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/location.h" 16 #include "base/location.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/metrics/histogram.h" 19 #include "base/metrics/histogram.h"
20 #include "base/prefs/pref_service.h"
21 #include "base/process/process_info.h" 20 #include "base/process/process_info.h"
22 #include "base/profiler/scoped_tracker.h" 21 #include "base/profiler/scoped_tracker.h"
23 #include "base/single_thread_task_runner.h" 22 #include "base/single_thread_task_runner.h"
24 #include "base/strings/string_number_conversions.h" 23 #include "base/strings/string_number_conversions.h"
25 #include "base/strings/string_util.h" 24 #include "base/strings/string_util.h"
26 #include "base/strings/stringprintf.h" 25 #include "base/strings/stringprintf.h"
27 #include "base/strings/utf_string_conversions.h" 26 #include "base/strings/utf_string_conversions.h"
28 #include "base/thread_task_runner_handle.h" 27 #include "base/thread_task_runner_handle.h"
29 #include "base/threading/thread.h" 28 #include "base/threading/thread.h"
30 #include "base/threading/thread_restrictions.h" 29 #include "base/threading/thread_restrictions.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 #include "chrome/grit/locale_settings.h" 157 #include "chrome/grit/locale_settings.h"
159 #include "components/app_modal/javascript_dialog_manager.h" 158 #include "components/app_modal/javascript_dialog_manager.h"
160 #include "components/bookmarks/browser/bookmark_model.h" 159 #include "components/bookmarks/browser/bookmark_model.h"
161 #include "components/bookmarks/browser/bookmark_utils.h" 160 #include "components/bookmarks/browser/bookmark_utils.h"
162 #include "components/bookmarks/common/bookmark_pref_names.h" 161 #include "components/bookmarks/common/bookmark_pref_names.h"
163 #include "components/browser_sync/browser/profile_sync_service.h" 162 #include "components/browser_sync/browser/profile_sync_service.h"
164 #include "components/bubble/bubble_controller.h" 163 #include "components/bubble/bubble_controller.h"
165 #include "components/content_settings/core/browser/host_content_settings_map.h" 164 #include "components/content_settings/core/browser/host_content_settings_map.h"
166 #include "components/favicon/content/content_favicon_driver.h" 165 #include "components/favicon/content/content_favicon_driver.h"
167 #include "components/history/core/browser/top_sites.h" 166 #include "components/history/core/browser/top_sites.h"
167 #include "components/prefs/pref_service.h"
168 #include "components/search/search.h" 168 #include "components/search/search.h"
169 #include "components/security_state/security_state_model.h" 169 #include "components/security_state/security_state_model.h"
170 #include "components/sessions/core/session_types.h" 170 #include "components/sessions/core/session_types.h"
171 #include "components/sessions/core/tab_restore_service.h" 171 #include "components/sessions/core/tab_restore_service.h"
172 #include "components/startup_metric_utils/browser/startup_metric_utils.h" 172 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
173 #include "components/translate/core/browser/language_state.h" 173 #include "components/translate/core/browser/language_state.h"
174 #include "components/ui/zoom/zoom_controller.h" 174 #include "components/ui/zoom/zoom_controller.h"
175 #include "components/web_modal/web_contents_modal_dialog_manager.h" 175 #include "components/web_modal/web_contents_modal_dialog_manager.h"
176 #include "content/public/browser/devtools_agent_host.h" 176 #include "content/public/browser/devtools_agent_host.h"
177 #include "content/public/browser/interstitial_page.h" 177 #include "content/public/browser/interstitial_page.h"
(...skipping 2561 matching lines...) Expand 10 before | Expand all | Expand 10 after
2739 if (contents && !allow_js_access) { 2739 if (contents && !allow_js_access) {
2740 contents->web_contents()->GetController().LoadURL( 2740 contents->web_contents()->GetController().LoadURL(
2741 target_url, 2741 target_url,
2742 content::Referrer(), 2742 content::Referrer(),
2743 ui::PAGE_TRANSITION_LINK, 2743 ui::PAGE_TRANSITION_LINK,
2744 std::string()); // No extra headers. 2744 std::string()); // No extra headers.
2745 } 2745 }
2746 2746
2747 return contents != NULL; 2747 return contents != NULL;
2748 } 2748 }
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