Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Issue 171413002: linux_aura: Keep GTK state from leaking between profiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac compile. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 } 202 }
203 203
204 @end 204 @end
205 205
206 206
207 class FakeTheme : public ui::ThemeProvider { 207 class FakeTheme : public ui::ThemeProvider {
208 public: 208 public:
209 FakeTheme(NSColor* color) : color_(color) {} 209 FakeTheme(NSColor* color) : color_(color) {}
210 base::scoped_nsobject<NSColor> color_; 210 base::scoped_nsobject<NSColor> color_;
211 211
212 virtual bool UsingNativeTheme() const OVERRIDE {
213 return true;
214 }
212 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE { 215 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE {
213 return NULL; 216 return NULL;
214 } 217 }
215 virtual SkColor GetColor(int id) const OVERRIDE { return SkColor(); } 218 virtual SkColor GetColor(int id) const OVERRIDE { return SkColor(); }
216 virtual int GetDisplayProperty(int id) const OVERRIDE { 219 virtual int GetDisplayProperty(int id) const OVERRIDE {
217 return -1; 220 return -1;
218 } 221 }
219 virtual bool ShouldUseNativeFrame() const OVERRIDE { return false; } 222 virtual bool ShouldUseNativeFrame() const OVERRIDE { return false; }
220 virtual bool HasCustomImage(int id) const OVERRIDE { return false; } 223 virtual bool HasCustomImage(int id) const OVERRIDE { return false; }
221 virtual base::RefCountedMemory* GetRawData( 224 virtual base::RefCountedMemory* GetRawData(
(...skipping 1849 matching lines...) Expand 10 before | Expand all | Expand 10 after
2071 "2f3b ] 4b "); 2074 "2f3b ] 4b ");
2072 actual = test::ModelStringFromNode(root); 2075 actual = test::ModelStringFromNode(root);
2073 EXPECT_EQ(expected, actual); 2076 EXPECT_EQ(expected, actual);
2074 2077
2075 // Verify that the other bookmark folder can't be deleted. 2078 // Verify that the other bookmark folder can't be deleted.
2076 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; 2079 BookmarkButton *otherButton = [bar_ otherBookmarksButton];
2077 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); 2080 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
2078 } 2081 }
2079 2082
2080 } // namespace 2083 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service_aurax11.cc ('k') | chrome/browser/ui/cocoa/download/background_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698