| 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> | 
| 6 | 6 | 
| 7 #include "base/mac/scoped_nsobject.h" | 7 #include "base/mac/scoped_nsobject.h" | 
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" | 
| 9 #include "chrome/browser/themes/theme_properties.h" | 9 #include "chrome/browser/themes/theme_properties.h" | 
| 10 #include "chrome/browser/themes/theme_service.h" | 10 #include "chrome/browser/themes/theme_service.h" | 
| 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 
| 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h" | 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h" | 
| 13 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" | 13 #import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h" | 
| 14 #include "testing/gmock/include/gmock/gmock.h" | 14 #include "testing/gmock/include/gmock/gmock.h" | 
| 15 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" | 
| 16 #include "testing/platform_test.h" | 16 #include "testing/platform_test.h" | 
| 17 #include "third_party/skia/include/core/SkBitmap.h" | 17 #include "third_party/skia/include/core/SkBitmap.h" | 
| 18 #include "third_party/skia/include/core/SkColor.h" | 18 #include "third_party/skia/include/core/SkColor.h" | 
| 19 #include "ui/gfx/image/image_skia.h" | 19 #include "ui/gfx/image/image_skia.h" | 
| 20 | 20 | 
| 21 using ::testing::_; | 21 using ::testing::_; | 
| 22 using ::testing::DoAll; | 22 using ::testing::DoAll; | 
| 23 using ::testing::NiceMock; | 23 using ::testing::NiceMock; | 
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 117   *arg1 = ThemeProperties::NO_REPEAT; | 117   *arg1 = ThemeProperties::NO_REPEAT; | 
| 118   return true; | 118   return true; | 
| 119 } | 119 } | 
| 120 | 120 | 
| 121 ACTION(SetAlignLeft) { | 121 ACTION(SetAlignLeft) { | 
| 122   *arg1 = ThemeProperties::ALIGN_LEFT; | 122   *arg1 = ThemeProperties::ALIGN_LEFT; | 
| 123   return true; | 123   return true; | 
| 124 } | 124 } | 
| 125 | 125 | 
| 126 // TODO(viettrungluu): write more unit tests, especially after my refactoring. | 126 // TODO(viettrungluu): write more unit tests, especially after my refactoring. | 
| OLD | NEW | 
|---|