| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/location_bar_view_mac.h" | 5 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/prefs/pref_service.h" | |
| 11 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| 12 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
| 13 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 15 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
| 16 #import "chrome/browser/app_controller_mac.h" | 15 #import "chrome/browser/app_controller_mac.h" |
| 17 #include "chrome/browser/command_updater.h" | 16 #include "chrome/browser/command_updater.h" |
| 18 #include "chrome/browser/defaults.h" | 17 #include "chrome/browser/defaults.h" |
| 19 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" | 18 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" |
| 20 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 19 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 47 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" | 46 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
| 48 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 47 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 49 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" | 48 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" |
| 50 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" | 49 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" |
| 51 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" | 50 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" |
| 52 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 51 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 53 #include "chrome/common/chrome_switches.h" | 52 #include "chrome/common/chrome_switches.h" |
| 54 #include "chrome/common/pref_names.h" | 53 #include "chrome/common/pref_names.h" |
| 55 #include "components/bookmarks/common/bookmark_pref_names.h" | 54 #include "components/bookmarks/common/bookmark_pref_names.h" |
| 56 #import "components/omnibox/browser/omnibox_popup_model.h" | 55 #import "components/omnibox/browser/omnibox_popup_model.h" |
| 56 #include "components/prefs/pref_service.h" |
| 57 #include "components/search_engines/template_url.h" | 57 #include "components/search_engines/template_url.h" |
| 58 #include "components/search_engines/template_url_service.h" | 58 #include "components/search_engines/template_url_service.h" |
| 59 #include "components/translate/core/browser/language_state.h" | 59 #include "components/translate/core/browser/language_state.h" |
| 60 #include "components/ui/zoom/zoom_controller.h" | 60 #include "components/ui/zoom/zoom_controller.h" |
| 61 #include "components/ui/zoom/zoom_event_manager.h" | 61 #include "components/ui/zoom/zoom_event_manager.h" |
| 62 #include "content/public/browser/web_contents.h" | 62 #include "content/public/browser/web_contents.h" |
| 63 #include "extensions/browser/extension_system.h" | 63 #include "extensions/browser/extension_system.h" |
| 64 #include "extensions/common/extension.h" | 64 #include "extensions/common/extension.h" |
| 65 #include "grit/components_scaled_resources.h" | 65 #include "grit/components_scaled_resources.h" |
| 66 #include "grit/theme_resources.h" | 66 #include "grit/theme_resources.h" |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 | 717 |
| 718 return zoom_decoration_->UpdateIfNecessary( | 718 return zoom_decoration_->UpdateIfNecessary( |
| 719 ui_zoom::ZoomController::FromWebContents(web_contents), | 719 ui_zoom::ZoomController::FromWebContents(web_contents), |
| 720 default_zoom_changed); | 720 default_zoom_changed); |
| 721 } | 721 } |
| 722 | 722 |
| 723 void LocationBarViewMac::OnDefaultZoomLevelChanged() { | 723 void LocationBarViewMac::OnDefaultZoomLevelChanged() { |
| 724 if (UpdateZoomDecoration(/*default_zoom_changed=*/true)) | 724 if (UpdateZoomDecoration(/*default_zoom_changed=*/true)) |
| 725 OnDecorationsChanged(); | 725 OnDecorationsChanged(); |
| 726 } | 726 } |
| OLD | NEW |