Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete defines in build files. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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" 10 #include "base/prefs/pref_service.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h" 49 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
50 #import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h" 50 #import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h"
51 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" 51 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
52 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 52 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
53 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 53 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
54 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" 54 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
55 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h" 55 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h"
56 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" 56 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
57 #include "chrome/browser/ui/tabs/tab_strip_model.h" 57 #include "chrome/browser/ui/tabs/tab_strip_model.h"
58 #include "chrome/browser/ui/toolbar/toolbar_model.h" 58 #include "chrome/browser/ui/toolbar/toolbar_model.h"
59 #include "chrome/browser/ui/zoom/zoom_controller.h"
60 #include "chrome/common/chrome_switches.h" 59 #include "chrome/common/chrome_switches.h"
61 #include "chrome/common/pref_names.h" 60 #include "chrome/common/pref_names.h"
62 #include "components/search_engines/template_url.h" 61 #include "components/search_engines/template_url.h"
63 #include "components/search_engines/template_url_service.h" 62 #include "components/search_engines/template_url_service.h"
64 #include "components/translate/core/browser/language_state.h" 63 #include "components/translate/core/browser/language_state.h"
64 #include "components/ui/zoom/zoom_controller.h"
65 #include "content/public/browser/web_contents.h" 65 #include "content/public/browser/web_contents.h"
66 #include "extensions/browser/extension_system.h" 66 #include "extensions/browser/extension_system.h"
67 #include "extensions/common/extension.h" 67 #include "extensions/common/extension.h"
68 #include "extensions/common/permissions/permissions_data.h" 68 #include "extensions/common/permissions/permissions_data.h"
69 #include "grit/components_scaled_resources.h" 69 #include "grit/components_scaled_resources.h"
70 #include "grit/theme_resources.h" 70 #include "grit/theme_resources.h"
71 #include "net/base/net_util.h" 71 #include "net/base/net_util.h"
72 #include "skia/ext/skia_utils_mac.h" 72 #include "skia/ext/skia_utils_mac.h"
73 #import "ui/base/cocoa/cocoa_base_utils.h" 73 #import "ui/base/cocoa/cocoa_base_utils.h"
74 #include "ui/base/l10n/l10n_util_mac.h" 74 #include "ui/base/l10n/l10n_util_mac.h"
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 translate_decoration_->SetVisible(enabled); 746 translate_decoration_->SetVisible(enabled);
747 translate_decoration_->SetLit(language_state.IsPageTranslated()); 747 translate_decoration_->SetLit(language_state.IsPageTranslated());
748 } 748 }
749 749
750 bool LocationBarViewMac::UpdateZoomDecoration() { 750 bool LocationBarViewMac::UpdateZoomDecoration() {
751 WebContents* web_contents = GetWebContents(); 751 WebContents* web_contents = GetWebContents();
752 if (!web_contents) 752 if (!web_contents)
753 return false; 753 return false;
754 754
755 return zoom_decoration_->UpdateIfNecessary( 755 return zoom_decoration_->UpdateIfNecessary(
756 ZoomController::FromWebContents(web_contents)); 756 ui_zoom::ZoomController::FromWebContents(web_contents));
757 } 757 }
758 758
759 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { 759 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {
760 bool is_visible = !GetToolbarModel()->input_in_progress() && 760 bool is_visible = !GetToolbarModel()->input_in_progress() &&
761 browser_->search_model()->voice_search_supported(); 761 browser_->search_model()->voice_search_supported();
762 if (mic_search_decoration_->IsVisible() == is_visible) 762 if (mic_search_decoration_->IsVisible() == is_visible)
763 return false; 763 return false;
764 mic_search_decoration_->SetVisible(is_visible); 764 mic_search_decoration_->SetVisible(is_visible);
765 return true; 765 return true;
766 } 766 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/location_bar/zoom_decoration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698