diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 01:13:18 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 01:13:18 +0000 |
| commit | c2a4159fde2513225efe7267b416402287a709d4 (patch) | |
| tree | f21dce2350f0fe5780f5f7a23087b88d88037a47 /chrome/renderer/extensions/user_script_slave.cc | |
| parent | 4223df5774c08d900fe3fe0acedcd21d23020ba2 (diff) | |
| download | chromium_src-c2a4159fde2513225efe7267b416402287a709d4.zip chromium_src-c2a4159fde2513225efe7267b416402287a709d4.tar.gz chromium_src-c2a4159fde2513225efe7267b416402287a709d4.tar.bz2 | |
Revert r99696 and r99705 due to crashes.
BUG=95667
Review URL: http://codereview.chromium.org/7848009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions/user_script_slave.cc')
| -rw-r--r-- | chrome/renderer/extensions/user_script_slave.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index d1e131e..dbdec79 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -8,17 +8,17 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/metrics/histogram.h" #include "base/perftimer.h" #include "base/pickle.h" #include "base/shared_memory.h" +#include "base/metrics/histogram.h" #include "base/stringprintf.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/chrome_render_process_observer.h" +#include "chrome/renderer/extensions/extension_dispatcher.h" #include "chrome/renderer/extensions/extension_groups.h" -#include "chrome/renderer/extensions/extension_renderer_context.h" #include "content/renderer/render_thread.h" #include "googleurl/src/gurl.h" #include "grit/renderer_resources.h" |