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/ui/toolbar/action_box_menu_model.h" | 5 #include "chrome/browser/ui/toolbar/action_box_menu_model.h" |
6 | 6 |
| 7 #include "base/prefs/testing_pref_service.h" |
7 #include "base/values.h" | 8 #include "base/values.h" |
8 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
9 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
11 #include "chrome/browser/chrome_to_mobile_service.h" | 12 #include "chrome/browser/chrome_to_mobile_service.h" |
12 #include "chrome/browser/chrome_to_mobile_service_factory.h" | 13 #include "chrome/browser/chrome_to_mobile_service_factory.h" |
| 14 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_command_controller.h" | 15 #include "chrome/browser/ui/browser_command_controller.h" |
14 #include "chrome/browser/ui/browser_commands.h" | 16 #include "chrome/browser/ui/browser_commands.h" |
15 #include "chrome/browser/ui/browser.h" | |
16 #include "chrome/common/extensions/feature_switch.h" | 17 #include "chrome/common/extensions/feature_switch.h" |
17 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.h" |
18 #include "chrome/test/base/browser_with_test_window_test.h" | 19 #include "chrome/test/base/browser_with_test_window_test.h" |
19 #include "chrome/test/base/testing_pref_service.h" | |
20 #include "chrome/test/base/testing_profile.h" | 20 #include "chrome/test/base/testing_profile.h" |
21 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
22 #include "grit/theme_resources.h" | 22 #include "grit/theme_resources.h" |
23 #include "sync/notifier/invalidation_util.h" | 23 #include "sync/notifier/invalidation_util.h" |
24 #include "testing/gtest/include/gtest/gtest.h" | 24 #include "testing/gtest/include/gtest/gtest.h" |
25 #include "third_party/skia/include/core/SkBitmap.h" | 25 #include "third_party/skia/include/core/SkBitmap.h" |
26 #include "ui/base/resource/resource_bundle.h" | 26 #include "ui/base/resource/resource_bundle.h" |
27 | 27 |
28 using extensions::FeatureSwitch; | 28 using extensions::FeatureSwitch; |
29 | 29 |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 SkBitmap lit_icon_bitmap = *lit_icon.ToSkBitmap(); | 252 SkBitmap lit_icon_bitmap = *lit_icon.ToSkBitmap(); |
253 SkAutoLockPixels c(bookmark_icon_bitmap2); | 253 SkAutoLockPixels c(bookmark_icon_bitmap2); |
254 SkAutoLockPixels d(lit_icon_bitmap); | 254 SkAutoLockPixels d(lit_icon_bitmap); |
255 | 255 |
256 | 256 |
257 // Verify that the icon in the menu is the lit icon. | 257 // Verify that the icon in the menu is the lit icon. |
258 EXPECT_EQ(0, memcmp(bookmark_icon_bitmap2.getPixels(), | 258 EXPECT_EQ(0, memcmp(bookmark_icon_bitmap2.getPixels(), |
259 lit_icon_bitmap.getPixels(), | 259 lit_icon_bitmap.getPixels(), |
260 lit_icon_bitmap.getSize())); | 260 lit_icon_bitmap.getSize())); |
261 } | 261 } |
OLD | NEW |