Chromium Code Reviews| 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 "chrome/browser/extensions/api/declarative_content/content_action.h" | 5 #include "chrome/browser/extensions/api/declarative_content/content_action.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 #include "extensions/common/extension.h" | 22 #include "extensions/common/extension.h" |
| 23 #include "extensions/common/extension_builder.h" | 23 #include "extensions/common/extension_builder.h" |
| 24 #include "extensions/common/feature_switch.h" | 24 #include "extensions/common/feature_switch.h" |
| 25 #include "extensions/common/value_builder.h" | 25 #include "extensions/common/value_builder.h" |
| 26 #include "ipc/ipc_message_utils.h" | 26 #include "ipc/ipc_message_utils.h" |
| 27 #include "testing/gmock/include/gmock/gmock.h" | 27 #include "testing/gmock/include/gmock/gmock.h" |
| 28 #include "testing/gtest/include/gtest/gtest.h" | 28 #include "testing/gtest/include/gtest/gtest.h" |
| 29 #include "third_party/skia/include/core/SkBitmap.h" | 29 #include "third_party/skia/include/core/SkBitmap.h" |
| 30 #include "ui/gfx/image/image.h" | 30 #include "ui/gfx/image/image.h" |
| 31 #include "ui/gfx/ipc/gfx_param_traits.h" | 31 #include "ui/gfx/ipc/gfx_param_traits.h" |
| 32 #include "ui/gfx/ipc/gfx_skia_param_traits.h" | |
|
Devlin
2016/03/28 21:01:51
Are either of these needed here? Or could we just
Mark Dittmer
2016/03/29 17:41:24
This file needs IPC::WriteParam<SkBitmap>.
Devlin
2016/03/29 20:01:56
But not gfx_param_traits.h now, right? Sorry if I
Mark Dittmer
2016/03/30 22:04:41
I see. Yes. In this case, we don't need gfx_param_
| |
| 32 | 33 |
| 33 namespace extensions { | 34 namespace extensions { |
| 34 namespace { | 35 namespace { |
| 35 | 36 |
| 36 using base::test::ParseJson; | 37 using base::test::ParseJson; |
| 37 using testing::HasSubstr; | 38 using testing::HasSubstr; |
| 38 | 39 |
| 39 | 40 |
| 40 scoped_ptr<base::DictionaryValue> SimpleManifest() { | 41 scoped_ptr<base::DictionaryValue> SimpleManifest() { |
| 41 return DictionaryBuilder() | 42 return DictionaryBuilder() |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 344 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" | 345 " \"instanceType\": \"declarativeContent.RequestContentScript\",\n" |
| 345 " \"js\": [\"script.js\"],\n" | 346 " \"js\": [\"script.js\"],\n" |
| 346 " \"matchAboutBlank\": null\n" | 347 " \"matchAboutBlank\": null\n" |
| 347 "}"), | 348 "}"), |
| 348 &error); | 349 &error); |
| 349 ASSERT_FALSE(result.get()); | 350 ASSERT_FALSE(result.get()); |
| 350 } | 351 } |
| 351 | 352 |
| 352 } // namespace | 353 } // namespace |
| 353 } // namespace extensions | 354 } // namespace extensions |
| OLD | NEW |