summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/browser.cc10
-rw-r--r--chrome/browser/ui/cocoa/applescript/tab_applescript.mm2
-rw-r--r--chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm2
-rw-r--r--chrome/browser/ui/gtk/browser_titlebar.cc2
-rw-r--r--chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc2
-rw-r--r--chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc2
-rw-r--r--chrome/browser/ui/panels/panel_browser_frame_view.cc2
-rw-r--r--chrome/browser/ui/tab_contents/tab_contents_wrapper.cc2
-rw-r--r--chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc6
-rw-r--r--chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc2
-rw-r--r--chrome/browser/ui/views/frame/browser_view.cc2
-rw-r--r--chrome/browser/ui/views/frame/opaque_browser_frame_view.cc2
-rw-r--r--chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc4
-rw-r--r--chrome/browser/ui/webui/history_ui.cc1
14 files changed, 20 insertions, 21 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index e84ce48..f5475ce 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2940,7 +2940,7 @@ void Browser::ActiveTabChanged(TabContentsWrapper* old_contents,
UpdateToolbar(true);
// Update reload/stop state.
- UpdateReloadStopState(new_contents->tab_contents()->is_loading(), true);
+ UpdateReloadStopState(new_contents->tab_contents()->IsLoading(), true);
// Update commands to reflect current state.
UpdateCommandsForTabState();
@@ -3150,14 +3150,14 @@ void Browser::LoadingStateChanged(TabContents* source) {
TabContents* selected_contents = GetSelectedTabContents();
if (source == selected_contents) {
- UpdateReloadStopState(source->is_loading(), false);
+ bool is_loading = source->IsLoading();
+ UpdateReloadStopState(is_loading, false);
if (GetStatusBubble()) {
GetStatusBubble()->SetStatus(
GetSelectedTabContentsWrapper()->GetStatusText());
}
- if (!source->is_loading() &&
- pending_web_app_action_ == UPDATE_SHORTCUT) {
+ if (!is_loading && pending_web_app_action_ == UPDATE_SHORTCUT) {
// Schedule a shortcut update when web application info is available if
// last committed entry is not NULL. Last committed entry could be NULL
// when an interstitial page is injected (e.g. bad https certificate,
@@ -4169,7 +4169,7 @@ void Browser::ScheduleUIUpdate(const TabContents* source,
// changed_flags.
}
- if (changed_flags & TabContents::INVALIDATE_TITLE && !source->is_loading()) {
+ if (changed_flags & TabContents::INVALIDATE_TITLE && !source->IsLoading()) {
// To correctly calculate whether the title changed while not loading
// we need to process the update synchronously. This state only matters for
// the TabStripModel, so we notify the TabStripModel now and notify others
diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
index 3d10924..2e694ba 100644
--- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
@@ -135,7 +135,7 @@
}
- (NSNumber*)loading {
- BOOL loadingValue = tabContents_->tab_contents()->is_loading() ? YES : NO;
+ BOOL loadingValue = tabContents_->tab_contents()->IsLoading() ? YES : NO;
return [NSNumber numberWithBool:loadingValue];
}
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 27c1e20..3a7da38 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -1378,7 +1378,7 @@ private:
} else if (contents->tab_contents()->waiting_for_response()) {
newState = kTabWaiting;
throbberImage = throbberWaitingImage;
- } else if (contents->tab_contents()->is_loading()) {
+ } else if (contents->tab_contents()->IsLoading()) {
newState = kTabLoading;
throbberImage = throbberLoadingImage;
}
diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc
index 2c210d3..4157650 100644
--- a/chrome/browser/ui/gtk/browser_titlebar.cc
+++ b/chrome/browser/ui/gtk/browser_titlebar.cc
@@ -625,7 +625,7 @@ void BrowserTitlebar::UpdateTitleAndIcon() {
void BrowserTitlebar::UpdateThrobber(TabContents* tab_contents) {
DCHECK(app_mode_favicon_);
- if (tab_contents && tab_contents->is_loading()) {
+ if (tab_contents && tab_contents->IsLoading()) {
GdkPixbuf* icon_pixbuf =
throbber_.GetNextFrame(tab_contents->waiting_for_response());
gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
index bae6b79..30d4dbc 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
@@ -320,7 +320,7 @@ void TabRendererGtk::UpdateData(TabContents* contents,
// Loading state also involves whether we show the favicon, since that's where
// we display the throbber.
- data_.loading = contents->is_loading();
+ data_.loading = contents->IsLoading();
data_.show_icon = wrapper->favicon_tab_helper()->ShouldDisplayFavicon();
}
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
index f01809d..5a57b9a 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
@@ -834,7 +834,7 @@ void TabStripGtk::UpdateLoadingAnimations() {
} else {
TabRendererGtk::AnimationState state;
TabContentsWrapper* contents = model_->GetTabContentsAt(index);
- if (!contents || !contents->tab_contents()->is_loading()) {
+ if (!contents || !contents->tab_contents()->IsLoading()) {
state = TabGtk::ANIMATION_NONE;
} else if (contents->tab_contents()->waiting_for_response()) {
state = TabGtk::ANIMATION_WAITING;
diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc
index af5dc83..cf904ed 100644
--- a/chrome/browser/ui/panels/panel_browser_frame_view.cc
+++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc
@@ -533,7 +533,7 @@ bool PanelBrowserFrameView::ShouldTabIconViewAnimate() const {
// TabIconView we host is initialized, so we need to NULL check the selected
// TabContents because in this condition there is not yet a selected tab.
TabContents* current_tab = browser_view_->GetSelectedTabContents();
- return current_tab ? current_tab->is_loading() : false;
+ return current_tab ? current_tab->IsLoading() : false;
}
SkBitmap PanelBrowserFrameView::GetFaviconForTabIconView() {
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
index f02f3c2..0487089 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
@@ -296,7 +296,7 @@ string16 TabContentsWrapper::GetDefaultTitle() {
}
string16 TabContentsWrapper::GetStatusText() const {
- if (!tab_contents()->is_loading() ||
+ if (!tab_contents()->IsLoading() ||
tab_contents()->load_state() == net::LOAD_STATE_IDLE) {
return string16();
}
diff --git a/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc b/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc
index 8e46fd9..88e8194 100644
--- a/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc
+++ b/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc
@@ -314,7 +314,7 @@ void CompactLocationBarViewHost::ActiveTabChanged(
int index,
bool user_gesture) {
current_tab_model_index_ = index;
- if (new_contents && new_contents->tab_contents()->is_loading()) {
+ if (new_contents && new_contents->tab_contents()->IsLoading()) {
Show(false);
} else {
Hide(false);
@@ -349,7 +349,7 @@ void CompactLocationBarViewHost::TabChangedAt(TabContentsWrapper* contents,
}
Update(tab_contents, false);
if (was_not_visible) {
- if (tab_contents->is_loading()) {
+ if (tab_contents->IsLoading()) {
// Register to NavigationController LOAD_STOP so that we can autohide
// when loading is done.
if (!registrar_.IsRegistered(this, content::NOTIFICATION_LOAD_STOP,
@@ -452,7 +452,7 @@ void CompactLocationBarViewHost::Update(TabContents* contents, bool animate) {
GetCompactLocationBarView()->Update(contents);
Show(animate && !showing_in_same_tab);
// If the tab is loading, we must wait for the notification that it is done.
- if (contents && !contents->is_loading()) {
+ if (contents && !contents->IsLoading()) {
// This will be a NOOP if we have focus.
// We never want to stay up, unless we have focus.
StartAutoHideTimer();
diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
index 1977a94..1450d90 100644
--- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
@@ -245,7 +245,7 @@ bool AppPanelBrowserFrameView::ShouldTabIconViewAnimate() const {
// TabIconView we host is initialized, so we need to NULL check the selected
// TabContents because in this condition there is not yet a selected tab.
TabContents* current_tab = browser_view_->GetSelectedTabContents();
- return current_tab ? current_tab->is_loading() : false;
+ return current_tab ? current_tab->IsLoading() : false;
}
SkBitmap AppPanelBrowserFrameView::GetFaviconForTabIconView() {
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 3ffac6e..77d8134 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2038,7 +2038,7 @@ void BrowserView::LoadingAnimationCallback() {
// GetSelectedTabContents can return NULL for example under Purify when
// the animations are running slowly and this function is called on a timer
// through LoadingAnimationCallback.
- frame_->UpdateThrobber(tab_contents && tab_contents->is_loading());
+ frame_->UpdateThrobber(tab_contents && tab_contents->IsLoading());
}
}
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index 1920b04..2a70291 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -493,7 +493,7 @@ bool OpaqueBrowserFrameView::ShouldTabIconViewAnimate() const {
// TabIconView we host is initialized, so we need to NULL check the selected
// TabContents because in this condition there is not yet a selected tab.
TabContents* current_tab = browser_view_->GetSelectedTabContents();
- return current_tab ? current_tab->is_loading() : false;
+ return current_tab ? current_tab->IsLoading() : false;
}
SkBitmap OpaqueBrowserFrameView::GetFaviconForTabIconView() {
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index b6cb10c..d6179f2 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -30,7 +30,7 @@
static TabRendererData::NetworkState TabContentsNetworkState(
TabContents* contents) {
- if (!contents || !contents->is_loading())
+ if (!contents || !contents->IsLoading())
return TabRendererData::NETWORK_STATE_NONE;
if (contents->waiting_for_response())
return TabRendererData::NETWORK_STATE_WAITING;
@@ -449,7 +449,7 @@ void BrowserTabStripController::SetTabRendererDataFromModel(
data->network_state = TabContentsNetworkState(contents);
data->title = contents->GetTitle();
data->url = contents->GetURL();
- data->loading = contents->is_loading();
+ data->loading = contents->IsLoading();
data->crashed_status = contents->crashed_status();
data->incognito = contents->profile()->IsOffTheRecord();
data->show_icon = wrapper->favicon_tab_helper()->ShouldDisplayFavicon();
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
index cefc2a7..e1b25a2 100644
--- a/chrome/browser/ui/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.cc
@@ -78,7 +78,6 @@ HistoryUIHTMLSource::HistoryUIHTMLSource()
: ChromeWebUIDataSource(chrome::kChromeUIHistoryHost) {
AddLocalizedString("loading", IDS_HISTORY_LOADING);
AddLocalizedString("title", IDS_HISTORY_TITLE);
- AddLocalizedString("loading", IDS_HISTORY_LOADING);
AddLocalizedString("newest", IDS_HISTORY_NEWEST);
AddLocalizedString("newer", IDS_HISTORY_NEWER);
AddLocalizedString("older", IDS_HISTORY_OLDER);
generated by cgit v1.1 at 2025-05-14 12:45:44 +0000