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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11825005: Move alternate_nav_infobar_delegate.* from c/b/infobars/ to c/b/ui/omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update chrome_browser_ui.gypi as well Created 7 years, 11 months 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm ('k') | chrome/browser/ui/gtk/infobars/alternate_nav_infobar_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.h" 9 #include "base/message_loop.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/sys_string_conversions.h" 12 #include "base/sys_string_conversions.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
15 #include "chrome/browser/alternate_nav_url_fetcher.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"
21 #include "chrome/browser/extensions/extension_action.h" 20 #include "chrome/browser/extensions/extension_action.h"
22 #include "chrome/browser/extensions/location_bar_controller.h" 21 #include "chrome/browser/extensions/location_bar_controller.h"
23 #include "chrome/browser/extensions/tab_helper.h" 22 #include "chrome/browser/extensions/tab_helper.h"
24 #include "chrome/browser/prefs/pref_service.h" 23 #include "chrome/browser/prefs/pref_service.h"
25 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
(...skipping 16 matching lines...) Expand all
42 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h" 41 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h"
43 #import "chrome/browser/ui/cocoa/location_bar/plus_decoration.h" 42 #import "chrome/browser/ui/cocoa/location_bar/plus_decoration.h"
44 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" 43 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
45 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h" 44 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
46 #import "chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.h" 45 #import "chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.h"
47 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" 46 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
48 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 47 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.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/intents/web_intent_picker_controller.h" 50 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
51 #include "chrome/browser/ui/omnibox/alternate_nav_url_fetcher.h"
52 #include "chrome/browser/ui/omnibox/location_bar_util.h" 52 #include "chrome/browser/ui/omnibox/location_bar_util.h"
53 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h" 53 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h"
54 #include "chrome/browser/ui/tabs/tab_strip_model.h" 54 #include "chrome/browser/ui/tabs/tab_strip_model.h"
55 #include "chrome/browser/ui/zoom/zoom_controller.h" 55 #include "chrome/browser/ui/zoom/zoom_controller.h"
56 #include "chrome/common/chrome_notification_types.h" 56 #include "chrome/common/chrome_notification_types.h"
57 #include "chrome/common/chrome_switches.h" 57 #include "chrome/common/chrome_switches.h"
58 #include "chrome/common/extensions/extension.h" 58 #include "chrome/common/extensions/extension.h"
59 #include "chrome/common/extensions/extension_resource.h" 59 #include "chrome/common/extensions/extension_resource.h"
60 #include "chrome/common/extensions/feature_switch.h" 60 #include "chrome/common/extensions/feature_switch.h"
61 #include "chrome/common/pref_names.h" 61 #include "chrome/common/pref_names.h"
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 visible = false; 777 visible = false;
778 star_decoration_->SetVisible(visible); 778 star_decoration_->SetVisible(visible);
779 } 779 }
780 780
781 void LocationBarViewMac::UpdatePlusDecorationVisibility() { 781 void LocationBarViewMac::UpdatePlusDecorationVisibility() {
782 if (extensions::FeatureSwitch::action_box()->IsEnabled()) { 782 if (extensions::FeatureSwitch::action_box()->IsEnabled()) {
783 // If the action box is enabled, hide it when input is in progress. 783 // If the action box is enabled, hide it when input is in progress.
784 plus_decoration_->SetVisible(!toolbar_model_->GetInputInProgress()); 784 plus_decoration_->SetVisible(!toolbar_model_->GetInputInProgress());
785 } 785 }
786 } 786 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm ('k') | chrome/browser/ui/gtk/infobars/alternate_nav_infobar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698