| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/toolbar_origin_chip_view.h" | 5 #include "chrome/browser/ui/views/toolbar/toolbar_origin_chip_view.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.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/favicon/favicon_tab_helper.h" | 14 #include "chrome/browser/favicon/favicon_tab_helper.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 16 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 17 #include "chrome/browser/safe_browsing/ui_manager.h" | 17 #include "chrome/browser/safe_browsing/ui_manager.h" |
| 18 #include "chrome/browser/search/search.h" | 18 #include "chrome/browser/search/search.h" |
| 19 #include "chrome/browser/themes/theme_properties.h" | 19 #include "chrome/browser/themes/theme_properties.h" |
| 20 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
| 21 #include "chrome/browser/ui/elide_url.h" | 21 #include "chrome/browser/ui/elide_url.h" |
| 22 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 22 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
| 23 #include "chrome/browser/ui/toolbar/origin_chip_info.h" | 23 #include "chrome/browser/ui/toolbar/origin_chip_info.h" |
| 24 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 24 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 25 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 25 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 26 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 26 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
| 27 #include "chrome/common/extensions/extension_constants.h" | 27 #include "chrome/common/extensions/extension_constants.h" |
| 28 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" | |
| 29 #include "content/public/browser/navigation_controller.h" | 28 #include "content/public/browser/navigation_controller.h" |
| 30 #include "content/public/browser/navigation_entry.h" | 29 #include "content/public/browser/navigation_entry.h" |
| 31 #include "content/public/browser/user_metrics.h" | 30 #include "content/public/browser/user_metrics.h" |
| 32 #include "content/public/browser/web_contents.h" | 31 #include "content/public/browser/web_contents.h" |
| 33 #include "content/public/common/url_constants.h" | 32 #include "content/public/common/url_constants.h" |
| 34 #include "extensions/browser/extension_system.h" | 33 #include "extensions/browser/extension_system.h" |
| 35 #include "extensions/common/constants.h" | 34 #include "extensions/common/constants.h" |
| 35 #include "extensions/common/manifest_handlers/icons_handler.h" |
| 36 #include "grit/generated_resources.h" | 36 #include "grit/generated_resources.h" |
| 37 #include "grit/theme_resources.h" | 37 #include "grit/theme_resources.h" |
| 38 #include "ui/base/l10n/l10n_util.h" | 38 #include "ui/base/l10n/l10n_util.h" |
| 39 #include "ui/base/resource/resource_bundle.h" | 39 #include "ui/base/resource/resource_bundle.h" |
| 40 #include "ui/base/theme_provider.h" | 40 #include "ui/base/theme_provider.h" |
| 41 #include "ui/views/background.h" | 41 #include "ui/views/background.h" |
| 42 #include "ui/views/button_drag_utils.h" | 42 #include "ui/views/button_drag_utils.h" |
| 43 #include "ui/views/controls/button/label_button.h" | 43 #include "ui/views/controls/button/label_button.h" |
| 44 #include "ui/views/controls/button/label_button_border.h" | 44 #include "ui/views/controls/button/label_button_border.h" |
| 45 #include "ui/views/controls/label.h" | 45 #include "ui/views/controls/label.h" |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 | 373 |
| 374 // Note: When OnSafeBrowsingHit would be called, OnSafeBrowsingMatch will | 374 // Note: When OnSafeBrowsingHit would be called, OnSafeBrowsingMatch will |
| 375 // have already been called. | 375 // have already been called. |
| 376 void ToolbarOriginChipView::OnSafeBrowsingHit( | 376 void ToolbarOriginChipView::OnSafeBrowsingHit( |
| 377 const SafeBrowsingUIManager::UnsafeResource& resource) {} | 377 const SafeBrowsingUIManager::UnsafeResource& resource) {} |
| 378 | 378 |
| 379 void ToolbarOriginChipView::OnSafeBrowsingMatch( | 379 void ToolbarOriginChipView::OnSafeBrowsingMatch( |
| 380 const SafeBrowsingUIManager::UnsafeResource& resource) { | 380 const SafeBrowsingUIManager::UnsafeResource& resource) { |
| 381 OnChanged(); | 381 OnChanged(); |
| 382 } | 382 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 229813002:
Move extensions manifest IconsHandler to //extensions (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src