summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/browser.scons1
-rw-r--r--chrome/browser/browser_init.cc2
-rw-r--r--chrome/browser/browser_prefs.cc8
-rw-r--r--chrome/browser/password_manager/password_form_manager.cc8
-rw-r--r--chrome/browser/tab_contents/navigation_controller.cc11
-rw-r--r--chrome/browser/tab_contents/navigation_controller.h16
-rw-r--r--chrome/browser/tab_contents/render_view_host_manager.cc7
-rw-r--r--chrome/browser/tab_contents/web_contents.h1
-rw-r--r--chrome/browser/tabs/tab_strip_model.cc4
-rw-r--r--chrome/chrome.xcodeproj/project.pbxproj6
-rw-r--r--chrome/common/temp_scaffolding_stubs.cc25
-rw-r--r--chrome/common/temp_scaffolding_stubs.h160
12 files changed, 116 insertions, 133 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 7924f91..9c383f5 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -772,7 +772,6 @@ if not env.Bit('windows'):
'tab_contents/interstitial_page.cc',
'tab_contents/ipc_status_view.cc',
'tab_contents/native_ui_contents.cc',
- 'tab_contents/navigation_controller.cc',
'tab_contents/network_status_view.cc',
'tab_contents/render_view_context_menu.cc',
'tab_contents/render_view_context_menu_controller.cc',
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index d6d10a0..47032cf 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/browser/session_startup_pref.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
@@ -37,7 +38,6 @@
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/sessions/session_restore.h"
#include "chrome/browser/tab_contents/infobar_delegate.h"
-#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/common/resource_bundle.h"
#include "chromium_strings.h"
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index bcd754c..4d0ee04 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -5,6 +5,8 @@
#include "chrome/browser/browser_prefs.h"
#include "chrome/browser/browser.h"
+#include "chrome/browser/cache_manager_host.h"
+#include "chrome/browser/renderer_host/browser_render_process_host.h"
#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
#include "chrome/browser/google_url_tracker.h"
#include "chrome/browser/session_startup_pref.h"
@@ -12,13 +14,11 @@
#if defined(OS_WIN) // TODO(port): whittle this down as we port
#include "chrome/browser/browser_shutdown.h"
-#include "chrome/browser/cache_manager_host.h"
#include "chrome/browser/net/dns_global.h"
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/external_protocol_handler.h"
#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/browser/password_manager/password_manager.h"
-#include "chrome/browser/renderer_host/browser_render_process_host.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/spellchecker.h"
#include "chrome/browser/ssl/ssl_manager.h"
@@ -37,16 +37,16 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
// Prefs in Local State
GoogleURLTracker::RegisterPrefs(local_state);
Browser::RegisterPrefs(local_state);
+ BrowserRenderProcessHost::RegisterPrefs(local_state);
+ CacheManagerHost::RegisterPrefs(local_state);
#if defined(OS_WIN) // TODO(port): whittle this down as we port
BookmarkManagerView::RegisterPrefs(local_state);
BrowserView::RegisterBrowserViewPrefs(local_state);
browser_shutdown::RegisterPrefs(local_state);
- CacheManagerHost::RegisterPrefs(local_state);
chrome_browser_net::RegisterPrefs(local_state);
MetricsLog::RegisterPrefs(local_state);
MetricsService::RegisterPrefs(local_state);
PageInfoWindow::RegisterPrefs(local_state);
- BrowserRenderProcessHost::RegisterPrefs(local_state);
TaskManager::RegisterPrefs(local_state);
ExternalProtocolHandler::RegisterPrefs(local_state);
SafeBrowsingService::RegisterPrefs(local_state);
diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc
index 6680bac..895b1e6 100644
--- a/chrome/browser/password_manager/password_form_manager.cc
+++ b/chrome/browser/password_manager/password_form_manager.cc
@@ -6,8 +6,14 @@
#include <algorithm>
-#include "base/string_util.h"
+#if defined(OS_POSIX)
+// TODO(port): remove these when supporting classes are ported
+#include "chrome/common/temp_scaffolding_stubs.h"
+#elif defined(OS_WIN)
#include "chrome/browser/password_manager/password_manager.h"
+#endif
+
+#include "base/string_util.h"
#include "chrome/browser/profile.h"
#include "webkit/glue/password_form_dom_manager.h"
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index 88d81ec..1e567f1 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -9,18 +9,21 @@
#include "base/string_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/dom_ui/dom_ui_host.h"
-#include "chrome/browser/repost_form_warning_dialog.h"
#include "chrome/browser/sessions/session_types.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/site_instance.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/tab_contents/tab_contents_delegate.h"
#include "chrome/common/navigation_types.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/resource_bundle.h"
#include "webkit/glue/webkit_glue.h"
+#if defined(OS_WIN)
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/browser/repost_form_warning_dialog.h"
+#endif
+
namespace {
// Invoked when entries have been pruned, or removed. For example, if the
@@ -920,7 +923,7 @@ void NavigationController::DiscardNonCommittedEntries() {
// If we are transitioning from two types of WebContents, we need to migrate
// the download shelf if it is visible. The download shelf may have been
// created before the error that caused us to discard the entry.
- WebContents::MigrateShelfView(from_contents, active_contents_);
+ TabContents::MigrateShelfView(from_contents, active_contents_);
if (from_contents->delegate()) {
from_contents->delegate()->ReplaceContents(from_contents,
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
index 2a6dea5..f39c595 100644
--- a/chrome/browser/tab_contents/navigation_controller.h
+++ b/chrome/browser/tab_contents/navigation_controller.h
@@ -7,14 +7,24 @@
#include <map>
+#include "build/build_config.h"
+
+#if defined(OS_POSIX)
+// TODO(port): remove when dependent classes are ported
+#include "chrome/common/temp_scaffolding_stubs.h"
+#elif defined(OS_WIN)
+#include "chrome/browser/ssl/ssl_manager.h"
+#endif
+
#include "base/linked_ptr.h"
#include "base/ref_counted.h"
+#include "googleurl/src/gurl.h"
#include "chrome/browser/sessions/session_id.h"
-#include "chrome/browser/ssl/ssl_manager.h"
#include "chrome/browser/tab_contents/tab_contents_type.h"
#include "chrome/common/navigation_types.h"
#include "chrome/common/page_transition_types.h"
+class NavigationEntry;
class GURL;
class Profile;
class TabContents;
@@ -509,8 +519,8 @@ class NavigationController {
// A map of TabContentsType -> TabContentsCollector containing all the
// pending collectors.
- typedef base::hash_map<TabContentsType, TabContentsCollector*>
- TabContentsCollectorMap;
+ typedef std::map<TabContentsType, TabContentsCollector*>
+ TabContentsCollectorMap;
TabContentsCollectorMap tab_contents_collector_map_;
// The tab contents that is currently active.
diff --git a/chrome/browser/tab_contents/render_view_host_manager.cc b/chrome/browser/tab_contents/render_view_host_manager.cc
index 92c1d04..c434b10 100644
--- a/chrome/browser/tab_contents/render_view_host_manager.cc
+++ b/chrome/browser/tab_contents/render_view_host_manager.cc
@@ -4,9 +4,14 @@
#include "chrome/browser/tab_contents/render_view_host_manager.h"
+#if defined(OS_POSIX)
+#include "chrome/common/temp_scaffolding_stubs.h"
+#elif defined(OS_WIN)
+#include "chrome/browser/renderer_host/render_widget_host_view.h"
+#endif
+
#include "base/command_line.h"
#include "base/logging.h"
-#include "chrome/browser/renderer_host/render_widget_host_view.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/renderer_host/render_view_host_delegate.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
diff --git a/chrome/browser/tab_contents/web_contents.h b/chrome/browser/tab_contents/web_contents.h
index 939fe67..ccd1e2e 100644
--- a/chrome/browser/tab_contents/web_contents.h
+++ b/chrome/browser/tab_contents/web_contents.h
@@ -9,6 +9,7 @@
#include "base/hash_tables.h"
#include "chrome/browser/cancelable_request.h"
#include "chrome/browser/renderer_host/render_view_host_delegate.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/render_view_host_manager.h"
#include "net/base/load_states.h"
#include "webkit/glue/password_form.h"
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index 8c5e8d2..327047e 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -7,8 +7,6 @@
#include <algorithm>
#if defined(OS_WIN)
-#include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#elif defined(OS_MACOSX) || (OS_LINUX)
// TODO(port): remove this when the mocks of the above classes are removed
@@ -16,7 +14,9 @@
#endif
#include "chrome/browser/metrics/user_metrics.h"
+#include "chrome/browser/profile.h"
#include "chrome/browser/tabs/tab_strip_model_order_controller.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/stl_util-inl.h"
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 09ef15d..e711e1b 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -302,6 +302,8 @@
E434BFA40F3A03E200B665C7 /* render_widget_host.cc in Sources */ = {isa = PBXBuildFile; fileRef = A76E42A30F28ED73009A7E88 /* render_widget_host.cc */; };
E434BFD90F3A074300B665C7 /* backing_store.cc in Sources */ = {isa = PBXBuildFile; fileRef = A7C613C40F30D82C008CEE5D /* backing_store.cc */; };
E434C0280F3A0C0100B665C7 /* render_view_host.cc in Sources */ = {isa = PBXBuildFile; fileRef = A76E429D0F28ED73009A7E88 /* render_view_host.cc */; };
+ E434C3740F3A464400B665C7 /* navigation_controller.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6CCB9D70F1EC32700106F0D /* navigation_controller.cc */; };
+ E434C46A0F3A5C6000B665C7 /* session_types.cc in Sources */ = {isa = PBXBuildFile; fileRef = E434C4690F3A5C6000B665C7 /* session_types.cc */; };
E43A770B0F1660EA00ABD5D1 /* automation_resource_tracker.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48FB9680EC4EA270052B72B /* automation_resource_tracker.cc */; };
E43A770D0F16610300ABD5D1 /* chrome_plugin_browsing_context.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF85B0E9D4839009A6919 /* chrome_plugin_browsing_context.cc */; };
E43A77110F16613700ABD5D1 /* chrome_url_request_context.cc in Sources */ = {isa = PBXBuildFile; fileRef = E43A77100F16613700ABD5D1 /* chrome_url_request_context.cc */; };
@@ -2038,6 +2040,7 @@
E433E65E0F323E2100CAC3AC /* tab_strip_view.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = tab_strip_view.mm; path = cocoa/tab_strip_view.mm; sourceTree = "<group>"; };
E434BE230F38DF4300B665C7 /* mock_render_thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mock_render_thread.h; sourceTree = "<group>"; };
E434BE240F38DF4300B665C7 /* mock_render_thread.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mock_render_thread.cc; sourceTree = "<group>"; };
+ E434C4690F3A5C6000B665C7 /* session_types.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = session_types.cc; path = sessions/session_types.cc; sourceTree = "<group>"; };
E43A770F0F16613700ABD5D1 /* chrome_url_request_context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chrome_url_request_context.h; sourceTree = "<group>"; };
E43A77100F16613700ABD5D1 /* chrome_url_request_context.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chrome_url_request_context.cc; sourceTree = "<group>"; };
E43A77150F16616E00ABD5D1 /* download_resource_handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = download_resource_handler.h; path = renderer_host/download_resource_handler.h; sourceTree = "<group>"; };
@@ -3631,6 +3634,7 @@
E45075F30F150C01003BE099 /* session_command.cc */,
E45075F50F150C0C003BE099 /* session_id.h */,
E45075F60F150C0C003BE099 /* session_id.cc */,
+ E434C4690F3A5C6000B665C7 /* session_types.cc */,
);
name = sessions;
sourceTree = "<group>";
@@ -4606,6 +4610,7 @@
B555B2230F21506300F751B9 /* metrics_log.cc in Sources */,
B555B2240F21506700F751B9 /* metrics_response.cc in Sources */,
E45075CD0F150741003BE099 /* mork_reader.cc in Sources */,
+ E434C3740F3A464400B665C7 /* navigation_controller.cc in Sources */,
E434BBAA0F37D4EA00B665C7 /* navigation_entry.cc in Sources */,
4D7BFABB0E9D49C1009A6919 /* page_number.cc in Sources */,
4D7BFAC60E9D49CB009A6919 /* page_range.cc in Sources */,
@@ -4638,6 +4643,7 @@
E45075F40F150C01003BE099 /* session_command.cc in Sources */,
E45075F70F150C0C003BE099 /* session_id.cc in Sources */,
4D7BF9B60E9D4894009A6919 /* session_startup_pref.cc in Sources */,
+ E434C46A0F3A5C6000B665C7 /* session_types.cc in Sources */,
A7CBAD390F322A7E00360BF5 /* shell_dialogs_mac.mm in Sources */,
E434BBB00F37D55800B665C7 /* site_instance.cc in Sources */,
4D7BFA2D0E9D4910009A6919 /* snippet.cc in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index cc5fbe6..b70d2fd 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -176,6 +176,30 @@ TabContents* TabContents::CreateWithType(TabContentsType type,
}
}
+void TabContents::SetupController(Profile* profile) {
+ DCHECK(!controller_);
+ controller_ = new NavigationController(this, profile);
+}
+
+Profile* TabContents::profile() const {
+ return controller_ ? controller_->profile() : NULL;
+}
+
+//--------------------------------------------------------------------------
+
+class RenderWidgetHostViewStub : public RenderWidgetHostView {
+ public:
+ RenderWidgetHostViewStub(RenderWidgetHost* host) {
+ host->set_view(this);
+ }
+};
+
+RenderWidgetHostView*
+ WebContentsView::CreateViewForWidget(RenderWidgetHost* host) {
+ NOTIMPLEMENTED();
+ return new RenderWidgetHostViewStub(host);
+}
+
//--------------------------------------------------------------------------
bool RLZTracker::GetAccessPointRlz(AccessPoint point, std::wstring* rlz) {
@@ -208,6 +232,7 @@ std::string GetUserAgent(const GURL& url) {
void SetRecordPlaybackMode(bool) { }
void SetJavaScriptFlags(const std::wstring&) { }
void CheckForLeaks() { }
+std::string CreateHistoryStateForURL(const GURL& url) { return ""; }
}
#endif
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index b9997cc..23ab507 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -42,6 +42,7 @@ class Browser;
class BookmarkService;
class CommandLine;
class ConstrainedWindow;
+class DOMUIHost;
class DownloadManager;
class HistoryService;
class MetricsService;
@@ -434,105 +435,6 @@ class FaviconStatus {
GURL url_;
};
-class NavigationController {
- public:
- struct LoadCommittedDetails {
- NavigationEntry* entry;
- bool is_main_frame;
- GURL previous_url;
- NavigationType::Type type;
- bool is_auto;
- bool is_in_page;
- bool is_content_filtered;
- std::string serialized_security_info;
- bool is_user_initiated_main_frame_load() const { return true; }
- };
- NavigationController() : entry_(new NavigationEntry(TAB_CONTENTS_WEB)) { }
- virtual ~NavigationController() { }
- bool CanGoBack() const {
- NOTIMPLEMENTED();
- return false;
- }
- bool CanGoForward() const {
- NOTIMPLEMENTED();
- return false;
- }
- void GoBack() { NOTIMPLEMENTED(); }
- void GoForward() { NOTIMPLEMENTED(); }
- void Reload(bool) { NOTIMPLEMENTED(); }
- NavigationController* Clone() {
- NOTIMPLEMENTED();
- return new NavigationController();
- }
- TabContents* active_contents() const {
- NOTIMPLEMENTED();
- return NULL;
- }
- NavigationEntry* GetLastCommittedEntry() const {
- NOTIMPLEMENTED();
- return entry_.get();
- }
- NavigationEntry* GetActiveEntry() const {
- NOTIMPLEMENTED();
- return entry_.get();
- }
- void LoadURL(const GURL& url, const GURL& referrer,
- PageTransition::Type type) { NOTIMPLEMENTED(); }
- NavigationEntry* GetPendingEntry() {
- NOTIMPLEMENTED();
- return entry_.get();
- }
- bool RendererDidNavigate(const ViewHostMsg_FrameNavigate_Params&,
- LoadCommittedDetails*) {
- NOTIMPLEMENTED();
- return true;
- }
- int GetEntryIndexWithPageID(TabContentsType, SiteInstance*,
- int32) const {
- NOTIMPLEMENTED();
- return 0;
- }
- NavigationEntry* GetEntryWithPageID(TabContentsType, SiteInstance*,
- int32) const {
- NOTIMPLEMENTED();
- return entry_.get();
- }
- NavigationEntry* GetEntryAtIndex(int index) const {
- NOTIMPLEMENTED();
- return entry_.get();
- }
- NavigationEntry* GetEntryAtOffset(int index) const {
- NOTIMPLEMENTED();
- return entry_.get();
- }
- int GetLastCommittedEntryIndex() const {
- NOTIMPLEMENTED();
- return 0;
- }
- int GetEntryCount() const {
- NOTIMPLEMENTED();
- return 1;
- }
- int GetCurrentEntryIndex() const {
- NOTIMPLEMENTED();
- return 0;
- }
- void NotifyEntryChanged(NavigationEntry*, int) { NOTIMPLEMENTED(); }
- bool IsURLInPageNavigation(const GURL&) {
- NOTIMPLEMENTED();
- return false;
- }
- void DiscardNonCommittedEntries() { NOTIMPLEMENTED(); }
- void GoToOffset(int) { NOTIMPLEMENTED(); }
- static void DisablePromptOnRepost() { NOTIMPLEMENTED(); }
- int max_restored_page_id() {
- NOTIMPLEMENTED();
- return 0;
- }
- private:
- scoped_ptr<NavigationEntry> entry_;
-};
-
class TabContentsDelegate {
public:
virtual void OpenURL(const GURL&, const GURL&, WindowOpenDisposition,
@@ -570,6 +472,7 @@ class TabContentsDelegate {
}
virtual void URLStarredChanged(WebContents*, bool) { NOTIMPLEMENTED(); }
virtual void ConvertContentsToApplication(WebContents*) { NOTIMPLEMENTED(); }
+ virtual void ReplaceContents(TabContents*, TabContents*) { NOTIMPLEMENTED(); }
};
class InterstitialPage {
@@ -599,6 +502,10 @@ class RenderWidgetHostView {
NOTIMPLEMENTED();
return NULL;
}
+ virtual void Hide() { NOTIMPLEMENTED(); }
+ virtual void Show() { NOTIMPLEMENTED(); }
+ virtual bool HasFocus() { NOTIMPLEMENTED(); return false; }
+ virtual void Focus() { NOTIMPLEMENTED(); }
virtual void UpdateCursorIfOverSelf() { NOTIMPLEMENTED(); }
virtual void SetTooltipText(const std::wstring& tooltip_text)
{ NOTIMPLEMENTED(); }
@@ -621,12 +528,10 @@ class TabContents : public NotificationObserver {
INVALIDATE_LOAD = 8,
INVALIDATE_EVERYTHING = 0xFFFFFFFF
};
- TabContents(TabContentsType) : controller_(new NavigationController) { }
+ TabContents(TabContentsType) : controller_() { }
virtual ~TabContents() { }
- NavigationController* controller() const {
- NOTIMPLEMENTED();
- return controller_.get();
- }
+ NavigationController* controller() const { return controller_; }
+ void set_controller(NavigationController* c) { controller_ = c; }
virtual WebContents* AsWebContents() const {
NOTIMPLEMENTED();
return NULL;
@@ -653,12 +558,9 @@ class TabContents : public NotificationObserver {
NOTIMPLEMENTED();
return false;
}
- Profile* profile() const {
- NOTIMPLEMENTED();
- return NULL;
- }
+ Profile* profile() const;
void CloseContents() { NOTIMPLEMENTED(); };
- void SetupController(Profile* profile) { NOTIMPLEMENTED(); }
+ void SetupController(Profile* profile);
bool WasHidden() {
NOTIMPLEMENTED();
return false;
@@ -688,27 +590,38 @@ class TabContents : public NotificationObserver {
void set_capturing_contents(bool) { NOTIMPLEMENTED(); }
bool is_active() {
NOTIMPLEMENTED();
- return false;
+ return true;
}
+ void set_is_active(bool) { NOTIMPLEMENTED(); }
void SetNotWaitingForResponse() { NOTIMPLEMENTED(); }
void NotifyNavigationStateChanged(int) { NOTIMPLEMENTED(); }
TabContentsDelegate* delegate() const {
NOTIMPLEMENTED();
return NULL;
}
- void AddInfoBar(InfoBarDelegate* delegate) { NOTIMPLEMENTED(); }
+ void AddInfoBar(InfoBarDelegate*) { NOTIMPLEMENTED(); }
void OpenURL(const GURL&, const GURL&, WindowOpenDisposition,
PageTransition::Type) { NOTIMPLEMENTED(); }
+ virtual void Activate() { NOTIMPLEMENTED(); }
+ virtual bool SupportsURL(GURL*) { NOTIMPLEMENTED(); return false; }
+ virtual SiteInstance* GetSiteInstance() const { return NULL; }
+ int32 GetMaxPageID() { NOTIMPLEMENTED(); return 0; }
+ void UpdateMaxPageID(int32) { NOTIMPLEMENTED(); }
+ virtual bool NavigateToPendingEntry(bool) { NOTIMPLEMENTED(); return true; }
+ virtual DOMUIHost* AsDOMUIHost() { NOTIMPLEMENTED(); return NULL; }
static void RegisterUserPrefs(PrefService* prefs) {
prefs->RegisterBooleanPref(prefs::kBlockPopups, false);
}
+ static void MigrateShelfView(TabContents* from, TabContents* to) {
+ NOTIMPLEMENTED();
+ }
protected:
typedef std::vector<ConstrainedWindow*> ConstrainedWindowList;
ConstrainedWindowList child_windows_;
private:
GURL url_;
std::wstring title_;
- scoped_ptr<NavigationController> controller_;
+ NavigationController* controller_;
};
class SelectFileDialog : public base::RefCountedThreadSafe<SelectFileDialog> {
@@ -885,10 +798,7 @@ class WebContentsView : public RenderViewHostDelegate::View {
return gfx::Size();
}
void SizeContents(const gfx::Size& size) { NOTIMPLEMENTED(); }
- RenderWidgetHostView* CreateViewForWidget(RenderWidgetHost*) {
- NOTIMPLEMENTED();
- return NULL;
- }
+ RenderWidgetHostView* CreateViewForWidget(RenderWidgetHost*);
void RenderWidgetHostDestroyed(RenderWidgetHost*) { NOTIMPLEMENTED(); }
void SetPageTitle(const std::wstring&) { NOTIMPLEMENTED(); }
virtual void CreateNewWindow(int,
@@ -964,6 +874,10 @@ class PasswordManager {
void PasswordFormsSeen(const std::vector<PasswordForm>&) { NOTIMPLEMENTED(); }
void DidNavigate() { NOTIMPLEMENTED(); }
void ProvisionallySavePassword(PasswordForm form) { NOTIMPLEMENTED(); }
+ void Autofill(const PasswordForm&, const PasswordFormMap&,
+ const PasswordForm* const) const {
+ NOTIMPLEMENTED();
+ }
};
class PluginInstaller {
@@ -989,6 +903,14 @@ class ConstrainedWindow {
class SSLManager {
public:
+ class Delegate {
+ public:
+ };
+ SSLManager(NavigationController* controller, Delegate* delegate) {
+ NOTIMPLEMENTED();
+ }
+ ~SSLManager() { }
+ void NavigationStateChanged() { NOTIMPLEMENTED(); }
static bool DeserializeSecurityInfo(const std::string&, int*, int*, int*);
};
@@ -1012,4 +934,10 @@ class SimpleAlertInfoBarDelegate : public InfoBarDelegate {
SimpleAlertInfoBarDelegate(WebContents*, const std::wstring&, void*) {}
};
+class RepostFormWarningDialog {
+ public:
+ static void RunRepostFormWarningDialog(NavigationController*) { }
+ virtual ~RepostFormWarningDialog() { }
+};
+
#endif // CHROME_COMMON_TEMP_SCAFFOLDING_STUBS_H_
generated by cgit v1.1 at 2025-01-22 08:14:11 +0000