diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 08:54:04 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 08:54:04 +0000 |
| commit | 7ce1599f47bc974ebb9e364e5b31e93a7011c15b (patch) | |
| tree | 8a4cbb3019462c1f30e6eb5e58f65c5f3ec4e438 /ui | |
| parent | a267567f15f568e4df68c991fd277b4d73450917 (diff) | |
| download | chromium_src-7ce1599f47bc974ebb9e364e5b31e93a7011c15b.zip chromium_src-7ce1599f47bc974ebb9e364e5b31e93a7011c15b.tar.gz chromium_src-7ce1599f47bc974ebb9e364e5b31e93a7011c15b.tar.bz2 | |
This CL makes managed users use the normal Google logo on the --enable-instant-extended-api NTP.
I also changed the signature of ui::ThemeProvider::GetDisplayProperty() because most of the callers were ignoring the return value. In some cases we were using uninitialized variables because of this.
BUG=279978
TEST=Manual, see bug
R=erg
TBR=sky (For trivial refactor)
Review URL: https://chromiumcodereview.appspot.com/23614007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/default_theme_provider.cc | 4 | ||||
| -rw-r--r-- | ui/base/default_theme_provider.h | 2 | ||||
| -rw-r--r-- | ui/base/theme_provider.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ui/base/default_theme_provider.cc b/ui/base/default_theme_provider.cc index e60c900..9777b390 100644 --- a/ui/base/default_theme_provider.cc +++ b/ui/base/default_theme_provider.cc @@ -26,8 +26,8 @@ SkColor DefaultThemeProvider::GetColor(int id) const { return 0xff0000ff; } -bool DefaultThemeProvider::GetDisplayProperty(int id, int* result) const { - return false; +int DefaultThemeProvider::GetDisplayProperty(int id) const { + return -1; } bool DefaultThemeProvider::ShouldUseNativeFrame() const { diff --git a/ui/base/default_theme_provider.h b/ui/base/default_theme_provider.h index 2594dfb..15fa4a9 100644 --- a/ui/base/default_theme_provider.h +++ b/ui/base/default_theme_provider.h @@ -26,7 +26,7 @@ class UI_EXPORT DefaultThemeProvider : public ThemeProvider { // Overridden from ui::ThemeProvider: virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE; virtual SkColor GetColor(int id) const OVERRIDE; - virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; + virtual int GetDisplayProperty(int id) const OVERRIDE; virtual bool ShouldUseNativeFrame() const OVERRIDE; virtual bool HasCustomImage(int id) const OVERRIDE; virtual base::RefCountedMemory* GetRawData( diff --git a/ui/base/theme_provider.h b/ui/base/theme_provider.h index 22f70a0..d12e265 100644 --- a/ui/base/theme_provider.h +++ b/ui/base/theme_provider.h @@ -59,7 +59,7 @@ class UI_EXPORT ThemeProvider { // Get the property (e.g. an alignment expressed in an enum, or a width or // height) specified by |id|. - virtual bool GetDisplayProperty(int id, int* result) const = 0; + virtual int GetDisplayProperty(int id) const = 0; // Whether we should use the native system frame (typically Aero glass) or // a custom frame. |