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

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

Issue 1341923002: Create a component for SSL error handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update iOS grit whitelist Created 5 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 #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)
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 #include "net/cookies/cookie_monster.h" 199 #include "net/cookies/cookie_monster.h"
200 #include "net/url_request/url_request_context.h" 200 #include "net/url_request/url_request_context.h"
201 #include "third_party/WebKit/public/web/WebWindowFeatures.h" 201 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
202 #include "ui/base/l10n/l10n_util.h" 202 #include "ui/base/l10n/l10n_util.h"
203 #include "ui/base/window_open_disposition.h" 203 #include "ui/base/window_open_disposition.h"
204 #include "ui/gfx/geometry/point.h" 204 #include "ui/gfx/geometry/point.h"
205 #include "ui/shell_dialogs/selected_file_info.h" 205 #include "ui/shell_dialogs/selected_file_info.h"
206 206
207 #if defined(OS_WIN) 207 #if defined(OS_WIN)
208 #include "base/win/metro.h" 208 #include "base/win/metro.h"
209 #include "chrome/browser/ssl/ssl_error_info.h"
210 #include "chrome/browser/task_manager/task_manager.h" 209 #include "chrome/browser/task_manager/task_manager.h"
211 #include "chrome/browser/ui/view_ids.h" 210 #include "chrome/browser/ui/view_ids.h"
212 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h" 211 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
213 #include "components/browser_watcher/exit_funnel_win.h" 212 #include "components/browser_watcher/exit_funnel_win.h"
214 #include "ui/base/touch/touch_device.h" 213 #include "ui/base/touch/touch_device.h"
215 #include "ui/base/win/shell.h" 214 #include "ui/base/win/shell.h"
216 #endif // OS_WIN 215 #endif // OS_WIN
217 216
218 #if defined(OS_CHROMEOS) 217 #if defined(OS_CHROMEOS)
219 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h" 218 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"
(...skipping 2476 matching lines...) Expand 10 before | Expand all | Expand 10 after
2696 if (contents && !allow_js_access) { 2695 if (contents && !allow_js_access) {
2697 contents->web_contents()->GetController().LoadURL( 2696 contents->web_contents()->GetController().LoadURL(
2698 target_url, 2697 target_url,
2699 content::Referrer(), 2698 content::Referrer(),
2700 ui::PAGE_TRANSITION_LINK, 2699 ui::PAGE_TRANSITION_LINK,
2701 std::string()); // No extra headers. 2700 std::string()); // No extra headers.
2702 } 2701 }
2703 2702
2704 return contents != NULL; 2703 return contents != NULL;
2705 } 2704 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_error_info.cc ('k') | chrome/browser/ui/website_settings/website_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698