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

Unified Diff: chrome/renderer/render_view.cc

Issue 3129003: remove toolstrips (Closed)
Patch Set: merge Created 10 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
« no previous file with comments | « chrome/renderer/render_view.h ('k') | chrome/renderer/renderer_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 07595eaa7fa8e1b45ce67eec4b357dc8b4c68a92..452404bb64da33270dbcbe6d8f6b33b9ff1d7000 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2953,11 +2953,6 @@ void RenderView::didCreateDocumentElement(WebFrame* frame) {
RenderThread::current()->user_script_slave()->InjectScripts(
frame, UserScript::DOCUMENT_START);
}
- if (view_type_ == ViewType::EXTENSION_TOOLSTRIP ||
- view_type_ == ViewType::EXTENSION_MOLE) {
- InjectToolstripCSS();
- ExtensionProcessBindings::SetViewType(webview(), view_type_);
- }
// Notify the browser about non-blank documents loading in the top frame.
GURL url = frame->url();
@@ -4190,15 +4185,6 @@ void RenderView::OnMediaPlayerActionAt(const gfx::Point& location,
}
void RenderView::OnNotifyRendererViewType(ViewType::Type type) {
- // When this is first set, the bindings aren't fully loaded. We only need
- // to call through this API after the page has already been loaded. It's
- // also called in didCreateDocumentElement to bootstrap.
- if (view_type_ != ViewType::INVALID) {
- if (type == ViewType::EXTENSION_MOLE ||
- type == ViewType::EXTENSION_TOOLSTRIP) {
- ExtensionProcessBindings::SetViewType(webview(), type);
- }
- }
view_type_ = type;
}
@@ -4583,17 +4569,6 @@ void RenderView::OnExtensionResponse(int request_id,
request_id, success, response, error);
}
-void RenderView::InjectToolstripCSS() {
- if (view_type_ != ViewType::EXTENSION_TOOLSTRIP)
- return;
-
- static const base::StringPiece toolstrip_css(
- ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_EXTENSION_TOOLSTRIP_CSS));
- std::string css = toolstrip_css.as_string();
- InsertCSS(L"", css, "ToolstripDefaultCSS");
-}
-
void RenderView::OnExtensionMessageInvoke(const std::string& function_name,
const ListValue& args,
bool requires_incognito_access,
« no previous file with comments | « chrome/renderer/render_view.h ('k') | chrome/renderer/renderer_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698