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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

Issue 7574021: Remove frontend code that allows for dynamic profile setting, and read the profile off the browse... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
===================================================================
--- chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm (revision 95527)
+++ chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm (working copy)
@@ -284,8 +284,9 @@
AutocompleteEditModel* edit_model,
Profile* profile,
NSTextField* field)
- : model_(new AutocompletePopupModel(this, edit_model, profile)),
- omnibox_view_(omnibox_view),
+ : omnibox_view_(omnibox_view),
+ model_(new AutocompletePopupModel(this, edit_model)),
+ profile_(profile),
field_(field),
popup_(nil),
opt_in_controller_(nil),
@@ -549,12 +550,11 @@
}
void OmniboxPopupViewMac::UserPressedOptIn(bool opt_in) {
- PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
+ PromoCounter* counter = profile_->GetInstantPromoCounter();
DCHECK(counter);
counter->Hide();
if (opt_in) {
- browser::ShowInstantConfirmDialogIfNecessary([field_ window],
- model_->profile());
+ browser::ShowInstantConfirmDialogIfNecessary([field_ window], profile_);
}
// This call will remove and delete |opt_in_controller_|.
@@ -562,7 +562,7 @@
}
bool OmniboxPopupViewMac::ShouldShowInstantOptIn() {
- PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
+ PromoCounter* counter = profile_->GetInstantPromoCounter();
return (counter && counter->ShouldShow(base::Time::Now()));
}
« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698