| Index: content/browser/tab_contents/tab_contents.h
|
| ===================================================================
|
| --- content/browser/tab_contents/tab_contents.h (revision 0)
|
| +++ content/browser/tab_contents/tab_contents.h (working copy)
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
|
| -#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
|
| +#ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
|
| +#define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
|
| #pragma once
|
|
|
| #include <deque>
|
| @@ -15,25 +15,25 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/scoped_ptr.h"
|
| #include "base/string16.h"
|
| -#include "chrome/browser/dom_ui/web_ui_factory.h"
|
| #include "chrome/browser/download/save_package.h"
|
| #include "chrome/browser/extensions/image_loading_tracker.h"
|
| #include "chrome/browser/fav_icon_helper.h"
|
| #include "chrome/browser/prefs/pref_change_registrar.h"
|
| #include "chrome/browser/renderer_host/render_view_host_delegate.h"
|
| -#include "chrome/browser/tab_contents/constrained_window.h"
|
| -#include "chrome/browser/tab_contents/language_state.h"
|
| -#include "chrome/browser/tab_contents/navigation_controller.h"
|
| -#include "chrome/browser/tab_contents/navigation_entry.h"
|
| -#include "chrome/browser/tab_contents/page_navigator.h"
|
| -#include "chrome/browser/tab_contents/render_view_host_manager.h"
|
| #include "chrome/browser/tab_contents/tab_specific_content_settings.h"
|
| #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
|
| +#include "chrome/browser/webui/web_ui_factory.h"
|
| #include "chrome/common/notification_registrar.h"
|
| #include "chrome/common/property_bag.h"
|
| #include "chrome/common/renderer_preferences.h"
|
| #include "chrome/common/translate_errors.h"
|
| #include "chrome/common/web_apps.h"
|
| +#include "content/browser/tab_contents/constrained_window.h"
|
| +#include "content/browser/tab_contents/language_state.h"
|
| +#include "content/browser/tab_contents/navigation_controller.h"
|
| +#include "content/browser/tab_contents/navigation_entry.h"
|
| +#include "content/browser/tab_contents/page_navigator.h"
|
| +#include "content/browser/tab_contents/render_view_host_manager.h"
|
| #include "net/base/load_states.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| @@ -130,8 +130,6 @@
|
| SessionStorageNamespace* session_storage_namespace);
|
| virtual ~TabContents();
|
|
|
| - static void RegisterUserPrefs(PrefService* prefs);
|
| -
|
| // Intrinsic tab state -------------------------------------------------------
|
|
|
| // Returns the property bag for this tab contents, where callers can add
|
| @@ -222,9 +220,6 @@
|
| virtual const GURL& GetURL() const;
|
| virtual const string16& GetTitle() const;
|
|
|
| - // Initial title assigned to NavigationEntries from Navigate.
|
| - static string16 GetDefaultTitle();
|
| -
|
| // The max PageID of any page that this TabContents has loaded. PageIDs
|
| // increase with each new page that is loaded by a tab. If this is a
|
| // TabContents, then the max PageID is kept separately on each SiteInstance.
|
| @@ -257,9 +252,6 @@
|
| // space is provided for the favicon, and the favicon is never displayed.
|
| virtual bool ShouldDisplayFavIcon();
|
|
|
| - // Returns a human-readable description the tab's loading state.
|
| - virtual string16 GetStatusText() const;
|
| -
|
| // Add and remove observers for page navigation notifications. Adding or
|
| // removing multiple times has no effect. The order in which notifications
|
| // are sent to observers is undefined. Clients must be sure to remove the
|
| @@ -275,6 +267,11 @@
|
| // "waiting" or "loading."
|
| bool waiting_for_response() const { return waiting_for_response_; }
|
|
|
| + net::LoadState load_state() const { return load_state_; }
|
| + string16 load_state_host() const { return load_state_host_; }
|
| + uint64 upload_size() const { return upload_size_; }
|
| + uint64 upload_position() const { return upload_position_; }
|
| +
|
| const std::string& encoding() const { return encoding_; }
|
| void set_encoding(const std::string& encoding);
|
| void reset_encoding() {
|
| @@ -962,7 +959,6 @@
|
| virtual WebPreferences GetWebkitPrefs();
|
| virtual void OnUserGesture();
|
| virtual void OnIgnoredUIEvent();
|
| - virtual void OnJSOutOfMemory();
|
| virtual void OnCrossSiteResponse(int new_render_process_host_id,
|
| int new_request_id);
|
| virtual void RendererUnresponsive(RenderViewHost* render_view_host,
|
| @@ -1259,4 +1255,4 @@
|
| DISALLOW_COPY_AND_ASSIGN(TabContents);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
|
| +#endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
|
|
|