| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/toolbar_model.h" | 5 #include "chrome/browser/toolbar_model.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" |
| 7 #include "chrome/browser/cert_store.h" | 8 #include "chrome/browser/cert_store.h" |
| 8 #include "chrome/browser/ssl/ssl_error_info.h" | 9 #include "chrome/browser/ssl/ssl_error_info.h" |
| 9 #include "chrome/browser/tab_contents/navigation_controller.h" | 10 #include "chrome/browser/tab_contents/navigation_controller.h" |
| 10 #include "chrome/browser/tab_contents/navigation_entry.h" | 11 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 11 #include "chrome/browser/tab_contents/tab_contents.h" | 12 #include "chrome/browser/tab_contents/tab_contents.h" |
| 12 #include "chrome/common/gfx/text_elider.h" | 13 #include "chrome/common/gfx/text_elider.h" |
| 13 #include "chrome/common/l10n_util.h" | |
| 14 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 15 #include "chrome/common/pref_service.h" | 15 #include "chrome/common/pref_service.h" |
| 16 #include "grit/generated_resources.h" | 16 #include "grit/generated_resources.h" |
| 17 #include "net/base/net_util.h" | 17 #include "net/base/net_util.h" |
| 18 | 18 |
| 19 ToolbarModel::ToolbarModel() : input_in_progress_(false) { | 19 ToolbarModel::ToolbarModel() : input_in_progress_(false) { |
| 20 } | 20 } |
| 21 | 21 |
| 22 ToolbarModel::~ToolbarModel() { | 22 ToolbarModel::~ToolbarModel() { |
| 23 } | 23 } |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 // Multiple errors. | 214 // Multiple errors. |
| 215 text->assign(l10n_util::GetString(IDS_SEVERAL_SSL_ERRORS)); | 215 text->assign(l10n_util::GetString(IDS_SEVERAL_SSL_ERRORS)); |
| 216 text->append(L"\n"); | 216 text->append(L"\n"); |
| 217 for (int i = 0; i < error_count; ++i) { | 217 for (int i = 0; i < error_count; ++i) { |
| 218 text->append(errors[i].short_description()); | 218 text->append(errors[i].short_description()); |
| 219 if (i != error_count - 1) | 219 if (i != error_count - 1) |
| 220 text->append(L"\n"); | 220 text->append(L"\n"); |
| 221 } | 221 } |
| 222 } | 222 } |
| 223 } | 223 } |
| OLD | NEW |