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

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

Issue 1727133002: Expose TLS settings in the Security panel overview, and call out individual obsolete settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add some tests. Created 4 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
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 #include <vector>
estark 2016/06/15 04:46:09 All these new #includes seem unnecessary since the
lgarron 2016/08/05 23:22:58 Oh my, that's embarrassing. I'm gonna have a stron
12 13
13 #include "base/base_paths.h" 14 #include "base/base_paths.h"
14 #include "base/bind.h" 15 #include "base/bind.h"
15 #include "base/command_line.h" 16 #include "base/command_line.h"
16 #include "base/location.h" 17 #include "base/location.h"
17 #include "base/logging.h" 18 #include "base/logging.h"
18 #include "base/macros.h" 19 #include "base/macros.h"
19 #include "base/metrics/histogram.h" 20 #include "base/metrics/histogram.h"
20 #include "base/process/process_info.h" 21 #include "base/process/process_info.h"
21 #include "base/profiler/scoped_tracker.h" 22 #include "base/profiler/scoped_tracker.h"
22 #include "base/single_thread_task_runner.h" 23 #include "base/single_thread_task_runner.h"
24 #include "base/strings/string16.h"
23 #include "base/strings/string_number_conversions.h" 25 #include "base/strings/string_number_conversions.h"
24 #include "base/strings/string_util.h" 26 #include "base/strings/string_util.h"
25 #include "base/strings/stringprintf.h" 27 #include "base/strings/stringprintf.h"
26 #include "base/strings/utf_string_conversions.h" 28 #include "base/strings/utf_string_conversions.h"
27 #include "base/threading/thread.h" 29 #include "base/threading/thread.h"
28 #include "base/threading/thread_restrictions.h" 30 #include "base/threading/thread_restrictions.h"
29 #include "base/threading/thread_task_runner_handle.h" 31 #include "base/threading/thread_task_runner_handle.h"
30 #include "base/time/time.h" 32 #include "base/time/time.h"
31 #include "build/build_config.h" 33 #include "build/build_config.h"
32 #include "chrome/app/chrome_command_ids.h" 34 #include "chrome/app/chrome_command_ids.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 #include "content/public/common/webplugininfo.h" 203 #include "content/public/common/webplugininfo.h"
202 #include "extensions/browser/extension_prefs.h" 204 #include "extensions/browser/extension_prefs.h"
203 #include "extensions/browser/extension_registry.h" 205 #include "extensions/browser/extension_registry.h"
204 #include "extensions/browser/extension_system.h" 206 #include "extensions/browser/extension_system.h"
205 #include "extensions/common/constants.h" 207 #include "extensions/common/constants.h"
206 #include "extensions/common/extension.h" 208 #include "extensions/common/extension.h"
207 #include "extensions/common/manifest_handlers/background_info.h" 209 #include "extensions/common/manifest_handlers/background_info.h"
208 #include "net/base/filename_util.h" 210 #include "net/base/filename_util.h"
209 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 211 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
210 #include "net/cookies/cookie_monster.h" 212 #include "net/cookies/cookie_monster.h"
213 #include "net/ssl/ssl_cipher_suite_names.h"
214 #include "net/ssl/ssl_connection_status_flags.h"
211 #include "net/url_request/url_request_context.h" 215 #include "net/url_request/url_request_context.h"
212 #include "third_party/WebKit/public/web/WebWindowFeatures.h" 216 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
213 #include "ui/base/l10n/l10n_util.h" 217 #include "ui/base/l10n/l10n_util.h"
214 #include "ui/base/window_open_disposition.h" 218 #include "ui/base/window_open_disposition.h"
215 #include "ui/gfx/geometry/point.h" 219 #include "ui/gfx/geometry/point.h"
216 #include "ui/shell_dialogs/selected_file_info.h" 220 #include "ui/shell_dialogs/selected_file_info.h"
217 221
218 #if defined(OS_WIN) 222 #if defined(OS_WIN)
219 #include <windows.h> 223 #include <windows.h>
220 #include <shellapi.h> 224 #include <shellapi.h>
(...skipping 2377 matching lines...) Expand 10 before | Expand all | Expand 10 after
2598 if (contents && !allow_js_access) { 2602 if (contents && !allow_js_access) {
2599 contents->web_contents()->GetController().LoadURL( 2603 contents->web_contents()->GetController().LoadURL(
2600 target_url, 2604 target_url,
2601 content::Referrer(), 2605 content::Referrer(),
2602 ui::PAGE_TRANSITION_LINK, 2606 ui::PAGE_TRANSITION_LINK,
2603 std::string()); // No extra headers. 2607 std::string()); // No extra headers.
2604 } 2608 }
2605 2609
2606 return contents != NULL; 2610 return contents != NULL;
2607 } 2611 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698