diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-22 04:11:19 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-22 04:11:19 +0000 |
| commit | e56c1a512ab3c29e6c44cda660f33ee09ff9bc06 (patch) | |
| tree | 788ad5e7b9fe2616a9d0ac7f1f2b6f6e579ebbbb /ash/desktop_background | |
| parent | a518fc69f6251a4261e5ac2c95deec8efcb475b5 (diff) | |
| download | chromium_src-e56c1a512ab3c29e6c44cda660f33ee09ff9bc06.zip chromium_src-e56c1a512ab3c29e6c44cda660f33ee09ff9bc06.tar.gz chromium_src-e56c1a512ab3c29e6c44cda660f33ee09ff9bc06.tar.bz2 | |
The way that ImageSkia::empty has been implemented, it is equivalent to ImageSkia::isNull. Replaced all instances of ImageSkia::empty with ImageSkia::isNull
Removed ImageSkia::extractSubset, and replaced calls to use ImageSkiaOperations::ExtractSubset instead
BUG=None
Test=Compiles, try bots pass.
Review URL: https://chromiumcodereview.appspot.com/10824359
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index 5db9135..41345a2 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -153,7 +153,7 @@ views::Widget* CreateDesktopBackground(aura::RootWindow* root_window, views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); DesktopBackgroundView* view = new DesktopBackgroundView(); params.delegate = view; - if (controller->GetWallpaper().empty()) + if (controller->GetWallpaper().isNull()) params.transparent = true; params.parent = root_window->GetChildById(container_id); desktop_widget->Init(params); |