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

Unified Diff: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

Issue 7523042: Add a status message "Waiting for extension Foo..." when there's a request (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final 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/tab_contents/tab_contents_wrapper.cc
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
index 438c02159ea10aeb831ee54b3e54deffdcf85c59..ffdd4582b1a655d6804d826b5c3f5048f8f5100d 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/lazy_instance.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete_history_manager.h"
#include "chrome/browser/autofill/autofill_manager.h"
#include "chrome/browser/automation/automation_tab_helper.h"
@@ -307,11 +308,14 @@ string16 TabContentsWrapper::GetDefaultTitle() {
string16 TabContentsWrapper::GetStatusText() const {
if (!tab_contents()->IsLoading() ||
- tab_contents()->load_state() == net::LOAD_STATE_IDLE) {
+ tab_contents()->load_state().state == net::LOAD_STATE_IDLE) {
return string16();
}
- switch (tab_contents()->load_state()) {
+ switch (tab_contents()->load_state().state) {
+ case net::LOAD_STATE_WAITING_FOR_DELEGATE:
+ return l10n_util::GetStringFUTF16(IDS_LOAD_STATE_WAITING_FOR_DELEGATE,
+ tab_contents()->load_state().param);
case net::LOAD_STATE_WAITING_FOR_CACHE:
return l10n_util::GetStringUTF16(IDS_LOAD_STATE_WAITING_FOR_CACHE);
case net::LOAD_STATE_ESTABLISHING_PROXY_TUNNEL:
« no previous file with comments | « chrome/browser/extensions/extension_webrequest_api_unittest.cc ('k') | content/browser/renderer_host/render_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698