Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/views/toolbar/site_chip_view.h" | 5 #include "chrome/browser/ui/views/toolbar/site_chip_view.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
| 12 #include "chrome/browser/extensions/extension_icon_image.h" | 12 #include "chrome/browser/extensions/extension_icon_image.h" |
| 13 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
| 14 #include "chrome/browser/extensions/extension_system.h" | 14 #include "chrome/browser/extensions/extension_system.h" |
| 15 #include "chrome/browser/favicon/favicon_tab_helper.h" | 15 #include "chrome/browser/favicon/favicon_tab_helper.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/safe_browsing/client_side_detection_host.h" | 17 #include "chrome/browser/safe_browsing/client_side_detection_host.h" |
| 18 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 18 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 19 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h" | 19 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h" |
| 20 #include "chrome/browser/safe_browsing/ui_manager.h" | 20 #include "chrome/browser/safe_browsing/ui_manager.h" |
| 21 #include "chrome/browser/search/search.h" | 21 #include "chrome/browser/search/search.h" |
| 22 #include "chrome/browser/themes/theme_properties.h" | 22 #include "chrome/browser/themes/theme_properties.h" |
| 23 #include "chrome/browser/ui/browser.h" | 23 #include "chrome/browser/ui/browser.h" |
| 24 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 24 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
| 25 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 25 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 26 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 26 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 27 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | |
|
msw
2013/12/12 22:25:08
Remove this; it's included by the header already.
Justin Donnelly
2013/12/12 22:43:53
Oh, duh. Done.
| |
| 27 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 28 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
| 28 #include "chrome/common/extensions/extension_constants.h" | 29 #include "chrome/common/extensions/extension_constants.h" |
| 29 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" | 30 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" |
| 30 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
| 31 #include "chrome/common/url_constants.h" | 32 #include "chrome/common/url_constants.h" |
| 32 #include "content/public/browser/web_contents.h" | 33 #include "content/public/browser/web_contents.h" |
| 33 #include "content/public/common/url_constants.h" | 34 #include "content/public/common/url_constants.h" |
| 34 #include "extensions/common/constants.h" | 35 #include "extensions/common/constants.h" |
| 35 #include "grit/component_strings.h" | 36 #include "grit/component_strings.h" |
| 36 #include "grit/generated_resources.h" | 37 #include "grit/generated_resources.h" |
| (...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 476 // Note: When OnSafeBrowsingHit would be called, OnSafeBrowsingMatch will | 477 // Note: When OnSafeBrowsingHit would be called, OnSafeBrowsingMatch will |
| 477 // have already been called. | 478 // have already been called. |
| 478 void SiteChipView::OnSafeBrowsingHit( | 479 void SiteChipView::OnSafeBrowsingHit( |
| 479 const SafeBrowsingUIManager::UnsafeResource& resource) {} | 480 const SafeBrowsingUIManager::UnsafeResource& resource) {} |
| 480 | 481 |
| 481 void SiteChipView::OnSafeBrowsingMatch( | 482 void SiteChipView::OnSafeBrowsingMatch( |
| 482 const SafeBrowsingUIManager::UnsafeResource& resource) { | 483 const SafeBrowsingUIManager::UnsafeResource& resource) { |
| 483 OnChanged(); | 484 OnChanged(); |
| 484 } | 485 } |
| 485 | 486 |
| OLD | NEW |