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/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.h" | 9 #include "base/message_loop.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" | 50 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
51 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" | 51 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" |
52 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" | 52 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" |
53 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" | 53 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" |
54 #include "chrome/browser/ui/omnibox/location_bar_util.h" | 54 #include "chrome/browser/ui/omnibox/location_bar_util.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/tab_contents/tab_contents.h" | 56 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
57 #include "chrome/common/chrome_notification_types.h" | 57 #include "chrome/common/chrome_notification_types.h" |
58 #include "chrome/common/chrome_switches.h" | 58 #include "chrome/common/chrome_switches.h" |
59 #include "chrome/common/extensions/extension.h" | 59 #include "chrome/common/extensions/extension.h" |
60 #include "chrome/common/extensions/extension_action.h" | 60 #include "chrome/browser/extensions/extension_action.h" |
61 #include "chrome/common/extensions/extension_resource.h" | 61 #include "chrome/common/extensions/extension_resource.h" |
62 #include "chrome/common/extensions/extension_switch_utils.h" | 62 #include "chrome/common/extensions/extension_switch_utils.h" |
63 #include "chrome/common/pref_names.h" | 63 #include "chrome/common/pref_names.h" |
64 #include "content/public/browser/notification_service.h" | 64 #include "content/public/browser/notification_service.h" |
65 #include "content/public/browser/web_contents.h" | 65 #include "content/public/browser/web_contents.h" |
66 #include "grit/generated_resources.h" | 66 #include "grit/generated_resources.h" |
67 #include "grit/theme_resources.h" | 67 #include "grit/theme_resources.h" |
68 #include "net/base/net_util.h" | 68 #include "net/base/net_util.h" |
69 #include "skia/ext/skia_utils_mac.h" | 69 #include "skia/ext/skia_utils_mac.h" |
70 #include "ui/base/l10n/l10n_util_mac.h" | 70 #include "ui/base/l10n/l10n_util_mac.h" |
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
767 visible = false; | 767 visible = false; |
768 star_decoration_->SetVisible(visible); | 768 star_decoration_->SetVisible(visible); |
769 } | 769 } |
770 | 770 |
771 void LocationBarViewMac::UpdatePlusDecorationVisibility() { | 771 void LocationBarViewMac::UpdatePlusDecorationVisibility() { |
772 if (extensions::switch_utils::IsActionBoxEnabled()) { | 772 if (extensions::switch_utils::IsActionBoxEnabled()) { |
773 // If the action box is enabled, hide it when input is in progress. | 773 // If the action box is enabled, hide it when input is in progress. |
774 plus_decoration_->SetVisible(!toolbar_model_->input_in_progress()); | 774 plus_decoration_->SetVisible(!toolbar_model_->input_in_progress()); |
775 } | 775 } |
776 } | 776 } |
OLD | NEW |