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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log
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)
11 11
12 #include <algorithm> 12 #include <algorithm>
13 #include <string> 13 #include <string>
14 14
15 #include "base/base_paths.h" 15 #include "base/base_paths.h"
16 #include "base/bind.h" 16 #include "base/bind.h"
17 #include "base/command_line.h" 17 #include "base/command_line.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/metrics/histogram.h" 19 #include "base/metrics/histogram.h"
20 #include "base/path_service.h" 20 #include "base/path_service.h"
21 #include "base/prefs/pref_service.h"
21 #include "base/process_info.h" 22 #include "base/process_info.h"
22 #include "base/string_util.h" 23 #include "base/string_util.h"
23 #include "base/stringprintf.h" 24 #include "base/stringprintf.h"
24 #include "base/strings/string_number_conversions.h" 25 #include "base/strings/string_number_conversions.h"
25 #include "base/threading/thread.h" 26 #include "base/threading/thread.h"
26 #include "base/threading/thread_restrictions.h" 27 #include "base/threading/thread_restrictions.h"
27 #include "base/time.h" 28 #include "base/time.h"
28 #include "base/utf_string_conversions.h" 29 #include "base/utf_string_conversions.h"
29 #include "chrome/app/chrome_command_ids.h" 30 #include "chrome/app/chrome_command_ids.h"
30 #include "chrome/browser/api/infobars/infobar_service.h" 31 #include "chrome/browser/api/infobars/infobar_service.h"
(...skipping 28 matching lines...) Expand all
59 #include "chrome/browser/first_run/first_run.h" 60 #include "chrome/browser/first_run/first_run.h"
60 #include "chrome/browser/google/google_url_tracker.h" 61 #include "chrome/browser/google/google_url_tracker.h"
61 #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h" 62 #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h"
62 #include "chrome/browser/intents/web_intents_reporting.h" 63 #include "chrome/browser/intents/web_intents_reporting.h"
63 #include "chrome/browser/intents/web_intents_util.h" 64 #include "chrome/browser/intents/web_intents_util.h"
64 #include "chrome/browser/lifetime/application_lifetime.h" 65 #include "chrome/browser/lifetime/application_lifetime.h"
65 #include "chrome/browser/net/url_fixer_upper.h" 66 #include "chrome/browser/net/url_fixer_upper.h"
66 #include "chrome/browser/notifications/notification_ui_manager.h" 67 #include "chrome/browser/notifications/notification_ui_manager.h"
67 #include "chrome/browser/pepper_broker_infobar_delegate.h" 68 #include "chrome/browser/pepper_broker_infobar_delegate.h"
68 #include "chrome/browser/prefs/incognito_mode_prefs.h" 69 #include "chrome/browser/prefs/incognito_mode_prefs.h"
69 #include "chrome/browser/prefs/pref_service.h"
70 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 70 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
71 #include "chrome/browser/profiles/profile.h" 71 #include "chrome/browser/profiles/profile.h"
72 #include "chrome/browser/profiles/profile_destroyer.h" 72 #include "chrome/browser/profiles/profile_destroyer.h"
73 #include "chrome/browser/profiles/profile_manager.h" 73 #include "chrome/browser/profiles/profile_manager.h"
74 #include "chrome/browser/profiles/profile_metrics.h" 74 #include "chrome/browser/profiles/profile_metrics.h"
75 #include "chrome/browser/repost_form_warning_controller.h" 75 #include "chrome/browser/repost_form_warning_controller.h"
76 #include "chrome/browser/sessions/session_service.h" 76 #include "chrome/browser/sessions/session_service.h"
77 #include "chrome/browser/sessions/session_service_factory.h" 77 #include "chrome/browser/sessions/session_service_factory.h"
78 #include "chrome/browser/sessions/session_tab_helper.h" 78 #include "chrome/browser/sessions/session_tab_helper.h"
79 #include "chrome/browser/sessions/session_types.h" 79 #include "chrome/browser/sessions/session_types.h"
(...skipping 2264 matching lines...) Expand 10 before | Expand all | Expand 10 after
2344 if (contents && !allow_js_access) { 2344 if (contents && !allow_js_access) {
2345 contents->web_contents()->GetController().LoadURL( 2345 contents->web_contents()->GetController().LoadURL(
2346 target_url, 2346 target_url,
2347 content::Referrer(), 2347 content::Referrer(),
2348 content::PAGE_TRANSITION_LINK, 2348 content::PAGE_TRANSITION_LINK,
2349 std::string()); // No extra headers. 2349 std::string()); // No extra headers.
2350 } 2350 }
2351 2351
2352 return contents != NULL; 2352 return contents != NULL;
2353 } 2353 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698