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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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/extension_infobar_controller.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_controller.mm » ('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/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 16 matching lines...) Expand all
27 #include "chrome/browser/search_engines/template_url_service.h" 27 #include "chrome/browser/search_engines/template_url_service.h"
28 #include "chrome/browser/search_engines/template_url_service_factory.h" 28 #include "chrome/browser/search_engines/template_url_service_factory.h"
29 #include "chrome/browser/ui/browser_instant_controller.h" 29 #include "chrome/browser/ui/browser_instant_controller.h"
30 #include "chrome/browser/ui/browser_list.h" 30 #include "chrome/browser/ui/browser_list.h"
31 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h " 31 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h "
32 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" 32 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
33 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h" 33 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h"
34 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" 34 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
35 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" 35 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
36 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h" 36 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h"
37 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h"
37 #import "chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h " 38 #import "chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h "
38 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h"
39 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h" 39 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
40 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" 40 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"
41 #import "chrome/browser/ui/cocoa/location_bar/mic_search_decoration.h" 41 #import "chrome/browser/ui/cocoa/location_bar/mic_search_decoration.h"
42 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h" 42 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h"
43 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" 43 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
44 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h" 44 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
45 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" 45 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
46 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 46 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
47 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 47 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
48 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" 48 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
49 #include "chrome/browser/ui/omnibox/location_bar_util.h" 49 #include "chrome/browser/ui/omnibox/location_bar_util.h"
50 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h" 50 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h"
51 #include "chrome/browser/ui/tabs/tab_strip_model.h" 51 #include "chrome/browser/ui/tabs/tab_strip_model.h"
52 #include "chrome/browser/ui/zoom/zoom_controller.h" 52 #include "chrome/browser/ui/zoom/zoom_controller.h"
53 #include "chrome/common/chrome_switches.h" 53 #include "chrome/common/chrome_switches.h"
54 #include "chrome/common/extensions/extension.h"
55 #include "chrome/common/pref_names.h" 54 #include "chrome/common/pref_names.h"
56 #include "content/public/browser/notification_service.h" 55 #include "content/public/browser/notification_service.h"
57 #include "content/public/browser/web_contents.h" 56 #include "content/public/browser/web_contents.h"
57 #include "extensions/common/extension.h"
58 #include "extensions/common/feature_switch.h" 58 #include "extensions/common/feature_switch.h"
59 #include "grit/generated_resources.h" 59 #include "grit/generated_resources.h"
60 #include "grit/theme_resources.h" 60 #include "grit/theme_resources.h"
61 #include "net/base/net_util.h" 61 #include "net/base/net_util.h"
62 #include "skia/ext/skia_utils_mac.h" 62 #include "skia/ext/skia_utils_mac.h"
63 #import "ui/base/cocoa/cocoa_event_utils.h" 63 #import "ui/base/cocoa/cocoa_event_utils.h"
64 #include "ui/base/l10n/l10n_util_mac.h" 64 #include "ui/base/l10n/l10n_util_mac.h"
65 #include "ui/base/resource/resource_bundle.h" 65 #include "ui/base/resource/resource_bundle.h"
66 #include "ui/gfx/image/image.h" 66 #include "ui/gfx/image/image.h"
67 67
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 } 685 }
686 686
687 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { 687 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {
688 bool is_visible = !GetToolbarModel()->input_in_progress() && 688 bool is_visible = !GetToolbarModel()->input_in_progress() &&
689 browser_->search_model()->voice_search_supported(); 689 browser_->search_model()->voice_search_supported();
690 if (mic_search_decoration_->IsVisible() == is_visible) 690 if (mic_search_decoration_->IsVisible() == is_visible)
691 return false; 691 return false;
692 mic_search_decoration_->SetVisible(is_visible); 692 mic_search_decoration_->SetVisible(is_visible);
693 return true; 693 return true;
694 } 694 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698