| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" | 5 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" |
| 6 | 6 |
| 7 #include "base/i18n/number_formatting.h" | 7 #include "base/i18n/number_formatting.h" |
| 8 #include "base/strings/string16.h" | 8 #include "base/strings/string16.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
| 11 #include "chrome/app/vector_icons/vector_icons.h" | 11 #include "chrome/app/vector_icons/vector_icons.h" |
| 12 #include "chrome/browser/ui/browser_dialogs.h" | 12 #include "chrome/browser/ui/browser_dialogs.h" |
| 13 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 13 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 14 #import "chrome/browser/ui/cocoa/l10n_util.h" | 14 #import "chrome/browser/ui/cocoa/l10n_util.h" |
| 15 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" | 15 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" |
| 16 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" | 16 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" |
| 17 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 17 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 18 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" | 18 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
| 19 #include "chrome/grit/generated_resources.h" | 19 #include "chrome/grit/generated_resources.h" |
| 20 #include "chrome/grit/theme_resources.h" | |
| 21 #include "components/zoom/zoom_controller.h" | 20 #include "components/zoom/zoom_controller.h" |
| 22 #include "ui/base/cocoa/cocoa_base_utils.h" | 21 #include "ui/base/cocoa/cocoa_base_utils.h" |
| 23 #include "ui/base/l10n/l10n_util_mac.h" | 22 #include "ui/base/l10n/l10n_util_mac.h" |
| 24 #include "ui/base/material_design/material_design_controller.h" | 23 #include "ui/base/material_design/material_design_controller.h" |
| 25 #import "ui/gfx/mac/coordinate_conversion.h" | 24 #import "ui/gfx/mac/coordinate_conversion.h" |
| 26 | 25 |
| 27 ZoomDecoration::ZoomDecoration(LocationBarViewMac* owner) | 26 ZoomDecoration::ZoomDecoration(LocationBarViewMac* owner) |
| 28 : owner_(owner), bubble_(nullptr), vector_icon_(nullptr) {} | 27 : owner_(owner), bubble_(nullptr), vector_icon_(nullptr) {} |
| 29 | 28 |
| 30 ZoomDecoration::~ZoomDecoration() { | 29 ZoomDecoration::~ZoomDecoration() { |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 // closed the decoration can be hidden. | 206 // closed the decoration can be hidden. |
| 208 if (IsAtDefaultZoom() && IsVisible()) { | 207 if (IsAtDefaultZoom() && IsVisible()) { |
| 209 SetVisible(false); | 208 SetVisible(false); |
| 210 owner_->OnDecorationsChanged(); | 209 owner_->OnDecorationsChanged(); |
| 211 } | 210 } |
| 212 } | 211 } |
| 213 | 212 |
| 214 const gfx::VectorIcon* ZoomDecoration::GetMaterialVectorIcon() const { | 213 const gfx::VectorIcon* ZoomDecoration::GetMaterialVectorIcon() const { |
| 215 return vector_icon_; | 214 return vector_icon_; |
| 216 } | 215 } |
| OLD | NEW |