ui/base/default_theme_provider.h - Issue 391053002: MacViews: Remove "redundant" #ifdef guards in ui/base/theme_provider* files

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/base/default_theme_provider.h

Issue 391053002: MacViews: Remove "redundant" #ifdef guards in ui/base/theme_provider* files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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

« no previous file with comments | « no previous file | ui/base/default_theme_provider_mac.mm » ('j') | no next file with comments »

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 #ifndef UI_BASE_DEFAULT_THEME_PROVIDER_H_	5 #ifndef UI_BASE_DEFAULT_THEME_PROVIDER_H_

6 #define UI_BASE_DEFAULT_THEME_PROVIDER_H_	6 #define UI_BASE_DEFAULT_THEME_PROVIDER_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 16 matching lines...) Expand all Loading...
27 virtual bool UsingSystemTheme() const OVERRIDE;	27 virtual bool UsingSystemTheme() const OVERRIDE;

28 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;	28 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;

29 virtual SkColor GetColor(int id) const OVERRIDE;	29 virtual SkColor GetColor(int id) const OVERRIDE;

30 virtual int GetDisplayProperty(int id) const OVERRIDE;	30 virtual int GetDisplayProperty(int id) const OVERRIDE;

31 virtual bool ShouldUseNativeFrame() const OVERRIDE;	31 virtual bool ShouldUseNativeFrame() const OVERRIDE;

32 virtual bool HasCustomImage(int id) const OVERRIDE;	32 virtual bool HasCustomImage(int id) const OVERRIDE;

33 virtual base::RefCountedMemory* GetRawData(	33 virtual base::RefCountedMemory* GetRawData(

34 int id,	34 int id,

35 ui::ScaleFactor scale_factor) const OVERRIDE;	35 ui::ScaleFactor scale_factor) const OVERRIDE;

36	36

37 #if defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS)	37 #if defined(OS_MACOSX)

38 virtual NSImage* GetNSImageNamed(int id) const OVERRIDE;	38 virtual NSImage* GetNSImageNamed(int id) const OVERRIDE;

39 virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE;	39 virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE;

40 virtual NSColor* GetNSColor(int id) const OVERRIDE;	40 virtual NSColor* GetNSColor(int id) const OVERRIDE;

41 virtual NSColor* GetNSColorTint(int id) const OVERRIDE;	41 virtual NSColor* GetNSColorTint(int id) const OVERRIDE;

42 virtual NSGradient* GetNSGradient(int id) const OVERRIDE;	42 virtual NSGradient* GetNSGradient(int id) const OVERRIDE;

43 #endif	43 #endif

44	44

45 private:	45 private:

46 DISALLOW_COPY_AND_ASSIGN(DefaultThemeProvider);	46 DISALLOW_COPY_AND_ASSIGN(DefaultThemeProvider);

47 };	47 };

48	48

49 } // namespace ui	49 } // namespace ui

50	50

51 #endif // UI_BASE_DEFAULT_THEME_PROVIDER_H_	51 #endif // UI_BASE_DEFAULT_THEME_PROVIDER_H_

OLD	NEW