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

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

Issue 17769005: Rewrite scoped_ptr<T>(NULL) to use the default ctor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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.h" 9 #include "base/message_loop.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 Browser* browser) 87 Browser* browser)
88 : omnibox_view_(new OmniboxViewMac(this, toolbar_model, profile, 88 : omnibox_view_(new OmniboxViewMac(this, toolbar_model, profile,
89 command_updater, field)), 89 command_updater, field)),
90 command_updater_(command_updater), 90 command_updater_(command_updater),
91 field_(field), 91 field_(field),
92 disposition_(CURRENT_TAB), 92 disposition_(CURRENT_TAB),
93 location_icon_decoration_(new LocationIconDecoration(this)), 93 location_icon_decoration_(new LocationIconDecoration(this)),
94 selected_keyword_decoration_(new SelectedKeywordDecoration()), 94 selected_keyword_decoration_(new SelectedKeywordDecoration()),
95 ev_bubble_decoration_( 95 ev_bubble_decoration_(
96 new EVBubbleDecoration(location_icon_decoration_.get())), 96 new EVBubbleDecoration(location_icon_decoration_.get())),
97 plus_decoration_(NULL),
98 star_decoration_(new StarDecoration(command_updater)), 97 star_decoration_(new StarDecoration(command_updater)),
99 zoom_decoration_(new ZoomDecoration(this)), 98 zoom_decoration_(new ZoomDecoration(this)),
100 keyword_hint_decoration_(new KeywordHintDecoration()), 99 keyword_hint_decoration_(new KeywordHintDecoration()),
101 profile_(profile), 100 profile_(profile),
102 browser_(browser), 101 browser_(browser),
103 toolbar_model_(toolbar_model), 102 toolbar_model_(toolbar_model),
104 transition_(content::PageTransitionFromInt( 103 transition_(content::PageTransitionFromInt(
105 content::PAGE_TRANSITION_TYPED | 104 content::PAGE_TRANSITION_TYPED |
106 content::PAGE_TRANSITION_FROM_ADDRESS_BAR)), 105 content::PAGE_TRANSITION_FROM_ADDRESS_BAR)),
107 weak_ptr_factory_(this) { 106 weak_ptr_factory_(this) {
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 visible = false; 755 visible = false;
757 star_decoration_->SetVisible(visible); 756 star_decoration_->SetVisible(visible);
758 } 757 }
759 758
760 void LocationBarViewMac::UpdatePlusDecorationVisibility() { 759 void LocationBarViewMac::UpdatePlusDecorationVisibility() {
761 if (extensions::FeatureSwitch::action_box()->IsEnabled()) { 760 if (extensions::FeatureSwitch::action_box()->IsEnabled()) {
762 // If the action box is enabled, hide it when input is in progress. 761 // If the action box is enabled, hide it when input is in progress.
763 plus_decoration_->SetVisible(!toolbar_model_->GetInputInProgress()); 762 plus_decoration_->SetVisible(!toolbar_model_->GetInputInProgress());
764 } 763 }
765 } 764 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_mac.mm ('k') | ui/app_list/cocoa/app_list_view_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698