| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/renderer/app_window_custom_bindings.h" | 5 #include "extensions/renderer/app_window_custom_bindings.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" |
| 10 #include "content/public/child/v8_value_converter.h" | 11 #include "content/public/child/v8_value_converter.h" |
| 11 #include "content/public/renderer/render_frame.h" | 12 #include "content/public/renderer/render_frame.h" |
| 12 #include "content/public/renderer/render_frame_observer.h" | 13 #include "content/public/renderer/render_frame_observer.h" |
| 13 #include "content/public/renderer/render_thread.h" | 14 #include "content/public/renderer/render_thread.h" |
| 14 #include "content/public/renderer/render_view.h" | 15 #include "content/public/renderer/render_view.h" |
| 15 #include "extensions/common/extension_messages.h" | 16 #include "extensions/common/extension_messages.h" |
| 16 #include "extensions/common/switches.h" | 17 #include "extensions/common/switches.h" |
| 17 #include "extensions/renderer/script_context.h" | 18 #include "extensions/renderer/script_context.h" |
| 18 #include "extensions/renderer/script_context_set.h" | 19 #include "extensions/renderer/script_context_set.h" |
| 19 #include "grit/extensions_renderer_resources.h" | 20 #include "grit/extensions_renderer_resources.h" |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 .GetRawDataResource(IDR_WINDOW_CONTROLS_TEMPLATE_HTML) | 126 .GetRawDataResource(IDR_WINDOW_CONTROLS_TEMPLATE_HTML) |
| 126 .as_string()); | 127 .as_string()); |
| 127 scoped_ptr<content::V8ValueConverter> converter( | 128 scoped_ptr<content::V8ValueConverter> converter( |
| 128 content::V8ValueConverter::create()); | 129 content::V8ValueConverter::create()); |
| 129 result = converter->ToV8Value(&value, context()->v8_context()); | 130 result = converter->ToV8Value(&value, context()->v8_context()); |
| 130 } | 131 } |
| 131 args.GetReturnValue().Set(result); | 132 args.GetReturnValue().Set(result); |
| 132 } | 133 } |
| 133 | 134 |
| 134 } // namespace extensions | 135 } // namespace extensions |
| OLD | NEW |