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

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

Issue 601733002: Rename component_resources.h to components_resources.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: output_name hack Created 6 years, 3 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
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "chrome/browser/ui/zoom/zoom_controller.h" 60 #include "chrome/browser/ui/zoom/zoom_controller.h"
61 #include "chrome/common/chrome_switches.h" 61 #include "chrome/common/chrome_switches.h"
62 #include "chrome/common/pref_names.h" 62 #include "chrome/common/pref_names.h"
63 #include "components/search_engines/template_url.h" 63 #include "components/search_engines/template_url.h"
64 #include "components/search_engines/template_url_service.h" 64 #include "components/search_engines/template_url_service.h"
65 #include "components/translate/core/browser/language_state.h" 65 #include "components/translate/core/browser/language_state.h"
66 #include "content/public/browser/web_contents.h" 66 #include "content/public/browser/web_contents.h"
67 #include "extensions/browser/extension_system.h" 67 #include "extensions/browser/extension_system.h"
68 #include "extensions/common/extension.h" 68 #include "extensions/common/extension.h"
69 #include "extensions/common/permissions/permissions_data.h" 69 #include "extensions/common/permissions/permissions_data.h"
70 #include "grit/component_scaled_resources.h" 70 #include "grit/components_scaled_resources.h"
71 #include "grit/theme_resources.h" 71 #include "grit/theme_resources.h"
72 #include "net/base/net_util.h" 72 #include "net/base/net_util.h"
73 #include "skia/ext/skia_utils_mac.h" 73 #include "skia/ext/skia_utils_mac.h"
74 #import "ui/base/cocoa/cocoa_base_utils.h" 74 #import "ui/base/cocoa/cocoa_base_utils.h"
75 #include "ui/base/l10n/l10n_util_mac.h" 75 #include "ui/base/l10n/l10n_util_mac.h"
76 #include "ui/gfx/image/image.h" 76 #include "ui/gfx/image/image.h"
77 77
78 using content::WebContents; 78 using content::WebContents;
79 79
80 namespace { 80 namespace {
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 } 765 }
766 766
767 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { 767 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {
768 bool is_visible = !GetToolbarModel()->input_in_progress() && 768 bool is_visible = !GetToolbarModel()->input_in_progress() &&
769 browser_->search_model()->voice_search_supported(); 769 browser_->search_model()->voice_search_supported();
770 if (mic_search_decoration_->IsVisible() == is_visible) 770 if (mic_search_decoration_->IsVisible() == is_visible)
771 return false; 771 return false;
772 mic_search_decoration_->SetVisible(is_visible); 772 mic_search_decoration_->SetVisible(is_visible);
773 return true; 773 return true;
774 } 774 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698