| 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 #import "chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.h" | 5 #import "chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.h" |
| 6 | 6 |
| 7 #include "base/metrics/histogram.h" | 7 #include "base/metrics/histogram.h" |
| 8 #include "base/metrics/user_metrics_action.h" | 8 #include "base/metrics/user_metrics_action.h" |
| 9 #include "base/strings/sys_string_conversions.h" | 9 #include "base/strings/sys_string_conversions.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/search/search.h" | 11 #include "chrome/browser/search/search.h" |
| 12 #include "chrome/browser/extensions/extension_icon_image.h" | |
| 13 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 12 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 14 #include "chrome/browser/safe_browsing/ui_manager.h" | 13 #include "chrome/browser/safe_browsing/ui_manager.h" |
| 15 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 14 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 16 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" | 15 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" |
| 17 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" | 16 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
| 18 #import "chrome/browser/ui/cocoa/nsview_additions.h" | 17 #import "chrome/browser/ui/cocoa/nsview_additions.h" |
| 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 20 #include "chrome/browser/ui/toolbar/origin_chip_info.h" | 19 #include "chrome/browser/ui/toolbar/origin_chip_info.h" |
| 21 #include "content/public/browser/user_metrics.h" | 20 #include "content/public/browser/user_metrics.h" |
| 21 #include "extensions/browser/extension_icon_image.h" |
| 22 #include "grit/theme_resources.h" | 22 #include "grit/theme_resources.h" |
| 23 #include "ui/base/l10n/l10n_util.h" | 23 #include "ui/base/l10n/l10n_util.h" |
| 24 #include "ui/base/resource/resource_bundle.h" | 24 #include "ui/base/resource/resource_bundle.h" |
| 25 #include "ui/gfx/image/image.h" | 25 #include "ui/gfx/image/image.h" |
| 26 | 26 |
| 27 namespace { | 27 namespace { |
| 28 | 28 |
| 29 const CGFloat kInnerLeftPadding = 5; | 29 const CGFloat kInnerLeftPadding = 5; |
| 30 const CGFloat kIconLabelPadding = 2; | 30 const CGFloat kIconLabelPadding = 2; |
| 31 const CGFloat kInnerRightPadding = 6; | 31 const CGFloat kInnerRightPadding = 6; |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 return kInnerLeftPadding + | 234 return kInnerLeftPadding + |
| 235 kIconSize + | 235 kIconSize + |
| 236 kIconLabelPadding + | 236 kIconLabelPadding + |
| 237 std::ceil([label_ sizeWithAttributes:attributes_].width) + | 237 std::ceil([label_ sizeWithAttributes:attributes_].width) + |
| 238 kInnerRightPadding; | 238 kInnerRightPadding; |
| 239 } | 239 } |
| 240 | 240 |
| 241 // TODO(macourteau): Implement eliding of the host. | 241 // TODO(macourteau): Implement eliding of the host. |
| 242 | 242 |
| 243 // TODO(macourteau): Implement dragging support. | 243 // TODO(macourteau): Implement dragging support. |
| OLD | NEW |