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

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

Issue 148083014: ExtensionSystem cleanup part 3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac Created 6 years, 10 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
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" 51 #include "chrome/browser/ui/content_settings/content_setting_image_model.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/toolbar/toolbar_model.h" 55 #include "chrome/browser/ui/toolbar/toolbar_model.h"
56 #include "chrome/browser/ui/zoom/zoom_controller.h" 56 #include "chrome/browser/ui/zoom/zoom_controller.h"
57 #include "chrome/common/chrome_switches.h" 57 #include "chrome/common/chrome_switches.h"
58 #include "chrome/common/pref_names.h" 58 #include "chrome/common/pref_names.h"
59 #include "content/public/browser/notification_service.h" 59 #include "content/public/browser/notification_service.h"
60 #include "content/public/browser/web_contents.h" 60 #include "content/public/browser/web_contents.h"
61 #include "extensions/browser/extension_system.h"
61 #include "extensions/common/extension.h" 62 #include "extensions/common/extension.h"
62 #include "extensions/common/permissions/permissions_data.h" 63 #include "extensions/common/permissions/permissions_data.h"
63 #include "grit/generated_resources.h" 64 #include "grit/generated_resources.h"
64 #include "grit/theme_resources.h" 65 #include "grit/theme_resources.h"
65 #include "net/base/net_util.h" 66 #include "net/base/net_util.h"
66 #include "skia/ext/skia_utils_mac.h" 67 #include "skia/ext/skia_utils_mac.h"
67 #import "ui/base/cocoa/cocoa_event_utils.h" 68 #import "ui/base/cocoa/cocoa_event_utils.h"
68 #include "ui/base/l10n/l10n_util_mac.h" 69 #include "ui/base/l10n/l10n_util_mac.h"
69 #include "ui/base/resource/resource_bundle.h" 70 #include "ui/base/resource/resource_bundle.h"
70 #include "ui/gfx/image/image.h" 71 #include "ui/gfx/image/image.h"
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 } 745 }
745 746
746 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { 747 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {
747 bool is_visible = !GetToolbarModel()->input_in_progress() && 748 bool is_visible = !GetToolbarModel()->input_in_progress() &&
748 browser_->search_model()->voice_search_supported(); 749 browser_->search_model()->voice_search_supported();
749 if (mic_search_decoration_->IsVisible() == is_visible) 750 if (mic_search_decoration_->IsVisible() == is_visible)
750 return false; 751 return false;
751 mic_search_decoration_->SetVisible(is_visible); 752 mic_search_decoration_->SetVisible(is_visible);
752 return true; 753 return true;
753 } 754 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/start_page_service_factory.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698