diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
4 files changed, 5 insertions, 5 deletions
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 f63f659..a1a0985 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -194,7 +194,7 @@ class FakeTheme : public ui::ThemeProvider { virtual bool GetDisplayProperty(int id, int* result) const { return false; } virtual bool ShouldUseNativeFrame() const { return false; } virtual bool HasCustomImage(int id) const { return false; } - virtual RefCountedMemory* GetRawData(int id) const { return NULL; } + virtual base::RefCountedMemory* GetRawData(int id) const { return NULL; } virtual NSImage* GetNSImageNamed(int id, bool allow_default) const { return nil; } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm index ba1cc8b..6b4654f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm @@ -33,7 +33,7 @@ class MockThemeProvider : public ui::ThemeProvider { MOCK_CONST_METHOD2(GetDisplayProperty, bool(int, int*)); MOCK_CONST_METHOD0(ShouldUseNativeFrame, bool()); MOCK_CONST_METHOD1(HasCustomImage, bool(int)); - MOCK_CONST_METHOD1(GetRawData, RefCountedMemory*(int)); + MOCK_CONST_METHOD1(GetRawData, base::RefCountedMemory*(int)); // OSX stuff MOCK_CONST_METHOD2(GetNSImageNamed, NSImage*(int, bool)); diff --git a/chrome/browser/ui/cocoa/download/background_theme.h b/chrome/browser/ui/cocoa/download/background_theme.h index bb21de2..e9d4bd7 100644 --- a/chrome/browser/ui/cocoa/download/background_theme.h +++ b/chrome/browser/ui/cocoa/download/background_theme.h @@ -22,7 +22,7 @@ class BackgroundTheme : public ui::ThemeProvider { virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; virtual bool ShouldUseNativeFrame() const OVERRIDE; virtual bool HasCustomImage(int id) const OVERRIDE; - virtual RefCountedMemory* GetRawData(int id) const OVERRIDE; + virtual base::RefCountedMemory* GetRawData(int id) const OVERRIDE; virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE; virtual NSColor* GetNSImageColorNamed(int id, bool allow_default) const OVERRIDE; diff --git a/chrome/browser/ui/cocoa/download/background_theme.mm b/chrome/browser/ui/cocoa/download/background_theme.mm index 1becbab..af4dc7c 100644 --- a/chrome/browser/ui/cocoa/download/background_theme.mm +++ b/chrome/browser/ui/cocoa/download/background_theme.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -47,7 +47,7 @@ bool BackgroundTheme::HasCustomImage(int id) const { return false; } -RefCountedMemory* BackgroundTheme::GetRawData(int id) const { +base::RefCountedMemory* BackgroundTheme::GetRawData(int id) const { return NULL; } |