diff options
| author | cira@google.com <cira@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 00:23:06 +0000 |
|---|---|---|
| committer | cira@google.com <cira@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 00:23:06 +0000 |
| commit | ee9080648d4f6ecceab3f0c1ba7048474893ce44 (patch) | |
| tree | a7be46563123556b658e397a4492d5563aba4b61 /chrome/renderer/render_thread.cc | |
| parent | 887eaa29c92cb8125c7cbc492dc564cf67d37899 (diff) | |
| download | chromium_src-ee9080648d4f6ecceab3f0c1ba7048474893ce44.zip chromium_src-ee9080648d4f6ecceab3f0c1ba7048474893ce44.tar.gz chromium_src-ee9080648d4f6ecceab3f0c1ba7048474893ce44.tar.bz2 | |
Revert 43684 - Localize CSS files in content scripts (but don't localize JS files).
Add UserScriptSlave unittest.
BUG=39899
TEST=List css file in content_scripts section of the manifest. Refer to an image using url(chromeextension://__MSG_@@extension_id_/image.png); within that css. @@extension_id message should be replaced with actual id of the extension.
Review URL: http://codereview.chromium.org/1585013
TBR=cira@chromium.org
Review URL: http://codereview.chromium.org/1525014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_thread.cc')
| -rw-r--r-- | chrome/renderer/render_thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 1d0be3e..a1e3a28 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -227,7 +227,7 @@ void RenderThread::Init() { task_factory_.reset(new ScopedRunnableMethodFactory<RenderThread>(this)); visited_link_slave_.reset(new VisitedLinkSlave()); - user_script_slave_.reset(new UserScriptSlave(this)); + user_script_slave_.reset(new UserScriptSlave()); dns_master_.reset(new RenderDnsMaster()); histogram_snapshots_.reset(new RendererHistogramSnapshots()); appcache_dispatcher_.reset(new AppCacheDispatcher(this)); @@ -463,7 +463,7 @@ void RenderThread::OnSetZoomLevelForCurrentHost(const std::string& host, void RenderThread::OnUpdateUserScripts(base::SharedMemoryHandle scripts) { DCHECK(base::SharedMemory::IsHandleValid(scripts)) << "Bad scripts handle"; - user_script_slave_->UpdateScripts(scripts, is_incognito_process()); + user_script_slave_->UpdateScripts(scripts); UpdateActiveExtensions(); } |