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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 11040055: Adds a FakeToolbarModel for use in testing. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: git try Created 8 years, 2 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
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_impl.cc ('k') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 730475d08ab2355de5fba326c49fcfbba30efe56..0658c1530ddcda996744148a71fdd9ca06983976 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -458,9 +458,9 @@ void LocationBarView::Update(const WebContents* tab_for_state_restoring) {
RefreshPageActionViews();
web_intents_button_view_->Update(GetTabContents());
open_pdf_in_reader_view_->Update(
- model_->input_in_progress() ? NULL : GetTabContents());
+ model_->GetInputInProgress() ? NULL : GetTabContents());
- bool star_enabled = star_view_ && !model_->input_in_progress() &&
+ bool star_enabled = star_view_ && !model_->GetInputInProgress() &&
edit_bookmarks_enabled_.GetValue();
command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled);
@@ -470,7 +470,7 @@ void LocationBarView::Update(const WebContents* tab_for_state_restoring) {
ChromeToMobileService* chrome_to_mobile_service =
ChromeToMobileServiceFactory::GetForProfile(profile_);
command_updater_->UpdateCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE,
- !model_->input_in_progress() && chrome_to_mobile_service &&
+ !model_->GetInputInProgress() && chrome_to_mobile_service &&
chrome_to_mobile_service->HasMobiles());
// Don't Update in app launcher mode so that the location entry does not show
@@ -521,7 +521,7 @@ void LocationBarView::UpdateWebIntentsButton() {
void LocationBarView::UpdateOpenPDFInReaderPrompt() {
open_pdf_in_reader_view_->Update(
- model_->input_in_progress() ? NULL : GetTabContents());
+ model_->GetInputInProgress() ? NULL : GetTabContents());
Layout();
SchedulePaint();
}
@@ -1224,7 +1224,7 @@ void LocationBarView::LayoutView(views::View* view,
void LocationBarView::RefreshContentSettingViews() {
for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
i != content_setting_views_.end(); ++i) {
- (*i)->Update(model_->input_in_progress() ? NULL : GetTabContents());
+ (*i)->Update(model_->GetInputInProgress() ? NULL : GetTabContents());
}
}
@@ -1288,7 +1288,7 @@ void LocationBarView::RefreshPageActionViews() {
for (PageActionViews::const_iterator i(page_action_views_.begin());
i != page_action_views_.end(); ++i) {
- (*i)->UpdateVisibility(model_->input_in_progress() ? NULL : contents,
+ (*i)->UpdateVisibility(model_->GetInputInProgress() ? NULL : contents,
url);
// Check if the visibility of the action changed and notify if it did.
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_impl.cc ('k') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698