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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Issue 23614007: Use the normal Google logo for managed users for --enable-instant-extended-api (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed mac compile failure Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/cocoa/download/background_theme.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 8a9b7f809f71e8ed318a18dca5790cc6f1f0c7c7..1e01e9d3ad6a2e6253ecf996d1442b77988e46a3 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -210,8 +210,8 @@ class FakeTheme : public ui::ThemeProvider {
return NULL;
}
virtual SkColor GetColor(int id) const OVERRIDE { return SkColor(); }
- virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE {
- return false;
+ virtual int GetDisplayProperty(int id) const OVERRIDE {
+ return -1;
}
virtual bool ShouldUseNativeFrame() const OVERRIDE { return false; }
virtual bool HasCustomImage(int id) const OVERRIDE { return false; }
« no previous file with comments | « chrome/browser/themes/theme_service.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