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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 7111013: Move most of the core SSL code from chrome to content. The UI code that's specific to Chrome (i.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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
« no previous file with comments | « chrome/browser/page_info_model.cc ('k') | chrome/browser/profiles/profile.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background_contents_service.h" 9 #include "chrome/browser/background_contents_service.h"
10 #include "chrome/browser/background_mode_manager.h" 10 #include "chrome/browser/background_mode_manager.h"
(...skipping 25 matching lines...) Expand all
36 #include "chrome/browser/plugin_updater.h" 36 #include "chrome/browser/plugin_updater.h"
37 #include "chrome/browser/policy/cloud_policy_subsystem.h" 37 #include "chrome/browser/policy/cloud_policy_subsystem.h"
38 #include "chrome/browser/prefs/session_startup_pref.h" 38 #include "chrome/browser/prefs/session_startup_pref.h"
39 #include "chrome/browser/printing/print_job_manager.h" 39 #include "chrome/browser/printing/print_job_manager.h"
40 #include "chrome/browser/profiles/profile_impl.h" 40 #include "chrome/browser/profiles/profile_impl.h"
41 #include "chrome/browser/profiles/profile_manager.h" 41 #include "chrome/browser/profiles/profile_manager.h"
42 #include "chrome/browser/renderer_host/web_cache_manager.h" 42 #include "chrome/browser/renderer_host/web_cache_manager.h"
43 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 43 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
44 #include "chrome/browser/search_engines/template_url_model.h" 44 #include "chrome/browser/search_engines/template_url_model.h"
45 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 45 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
46 #include "chrome/browser/ssl/ssl_manager.h"
47 #include "chrome/browser/sync/signin_manager.h" 46 #include "chrome/browser/sync/signin_manager.h"
48 #include "chrome/browser/tabs/pinned_tab_codec.h" 47 #include "chrome/browser/tabs/pinned_tab_codec.h"
49 #include "chrome/browser/task_manager/task_manager.h" 48 #include "chrome/browser/task_manager/task_manager.h"
50 #include "chrome/browser/translate/translate_prefs.h" 49 #include "chrome/browser/translate/translate_prefs.h"
51 #include "chrome/browser/ui/browser.h" 50 #include "chrome/browser/ui/browser.h"
52 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 51 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
53 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 52 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
54 #include "chrome/browser/ui/webui/flags_ui.h" 53 #include "chrome/browser/ui/webui/flags_ui.h"
55 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 54 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
56 #include "chrome/browser/ui/webui/plugins_ui.h" 55 #include "chrome/browser/ui/webui/plugins_ui.h"
57 #include "chrome/browser/upgrade_detector.h" 56 #include "chrome/browser/upgrade_detector.h"
58 #include "chrome/browser/web_resource/promo_resource_service.h" 57 #include "chrome/browser/web_resource/promo_resource_service.h"
59 #include "chrome/common/pref_names.h" 58 #include "chrome/common/pref_names.h"
60 #include "content/browser/host_zoom_map.h" 59 #include "content/browser/host_zoom_map.h"
61 #include "content/browser/renderer_host/browser_render_process_host.h" 60 #include "content/browser/renderer_host/browser_render_process_host.h"
61 #include "content/browser/ssl/ssl_manager.h"
62 62
63 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port 63 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port
64 #include "chrome/browser/ui/views/browser_actions_container.h" 64 #include "chrome/browser/ui/views/browser_actions_container.h"
65 #include "chrome/browser/ui/views/frame/browser_view.h" 65 #include "chrome/browser/ui/views/frame/browser_view.h"
66 #endif 66 #endif
67 67
68 #if defined(TOOLKIT_GTK) 68 #if defined(TOOLKIT_GTK)
69 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 69 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
70 #endif 70 #endif
71 71
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 193 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
194 } 194 }
195 local_state->ClearPref(prefs::kBrowserWindowPlacement); 195 local_state->ClearPref(prefs::kBrowserWindowPlacement);
196 196
197 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 197 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
198 current_version | WINDOWS_PREFS); 198 current_version | WINDOWS_PREFS);
199 } 199 }
200 } 200 }
201 201
202 } // namespace browser 202 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/page_info_model.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698