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

Unified Diff: content/browser/tab_contents/tab_contents.h

Issue 6708114: Revert 79691 - Move WebUIFactory to chrome/browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 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: content/browser/tab_contents/tab_contents.h
===================================================================
--- content/browser/tab_contents/tab_contents.h (revision 79692)
+++ content/browser/tab_contents/tab_contents.h (working copy)
@@ -31,7 +31,7 @@
#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 "content/browser/webui/web_ui.h"
+#include "content/browser/webui/web_ui_factory.h"
#include "content/common/notification_registrar.h"
#include "content/common/property_bag.h"
#include "content/common/renderer_preferences.h"
@@ -600,7 +600,7 @@
return &renderer_preferences_;
}
- void set_opener_web_ui_type(WebUI::TypeID opener_web_ui_type) {
+ void set_opener_web_ui_type(WebUITypeID opener_web_ui_type) {
opener_web_ui_type_ = opener_web_ui_type;
}
@@ -693,9 +693,6 @@
return safebrowsing_detection_host_.get();
}
- // Query the WebUIFactory for the TypeID for the current URL.
- WebUI::TypeID GetWebUITypeForCurrentState();
-
protected:
// from RenderViewHostDelegate.
virtual bool OnMessageReceived(const IPC::Message& message);
@@ -1177,7 +1174,7 @@
// If this tab was created from a renderer using window.open, this will be
// non-NULL and represent the WebUI of the opening renderer.
- WebUI::TypeID opener_web_ui_type_;
+ WebUITypeID opener_web_ui_type_;
// The time that we started to create the new tab page.
base::TimeTicks new_tab_start_time_;
« no previous file with comments | « content/browser/tab_contents/render_view_host_manager.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698