diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 22:50:13 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 22:50:13 +0000 |
| commit | 02dbd1a5cee5ea3df9ec09dfcba4400e170c8962 (patch) | |
| tree | bac2c69d9322595af20ce450abc23717cc3665a8 /ash/launcher | |
| parent | bde0e4fc9eb40a768c8fb94d8aae1a95288f2499 (diff) | |
| download | chromium_src-02dbd1a5cee5ea3df9ec09dfcba4400e170c8962.zip chromium_src-02dbd1a5cee5ea3df9ec09dfcba4400e170c8962.tar.gz chromium_src-02dbd1a5cee5ea3df9ec09dfcba4400e170c8962.tar.bz2 | |
Don't check NULL for ShellDelegate.
This is fixed in r165239 and it's guaranteed not to be NULL now.
BUG=159693
TEST=none all tests should pass.
Review URL: https://chromiumcodereview.appspot.com/11377063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher.cc | 9 | ||||
| -rw-r--r-- | ash/launcher/launcher_view.cc | 7 |
2 files changed, 2 insertions, 14 deletions
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc index 8051fad..b794cc3 100644 --- a/ash/launcher/launcher.cc +++ b/ash/launcher/launcher.cc @@ -206,10 +206,8 @@ Launcher::Launcher(aura::Window* window_container, alignment_(SHELF_ALIGNMENT_BOTTOM), background_animator_(delegate_view_, 0, kLauncherBackgroundAlpha) { model_.reset(new LauncherModel); - if (Shell::GetInstance()->delegate()) { - delegate_.reset( - Shell::GetInstance()->delegate()->CreateLauncherDelegate(model_.get())); - } + delegate_.reset( + Shell::GetInstance()->delegate()->CreateLauncherDelegate(model_.get())); widget_.reset(new views::Widget); views::Widget::InitParams params( @@ -318,9 +316,6 @@ void Launcher::SetStatusSize(const gfx::Size& size) { } gfx::Rect Launcher::GetScreenBoundsOfItemIconForWindow(aura::Window* window) { - if (!delegate_.get()) - return gfx::Rect(); - LauncherID id = delegate_->GetIDByWindow(window); gfx::Rect bounds(launcher_view_->GetIdealBoundsOfItemIcon(id)); if (bounds.IsEmpty()) diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index 47c23c5..1bc8cc6 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -975,8 +975,6 @@ ShelfAlignment LauncherView::GetShelfAlignment() const { } string16 LauncherView::GetAccessibleName(const views::View* view) { - if (!delegate_) - return string16(); int view_index = view_model_->GetIndexOfView(view); // May be -1 while in the process of animating closed. if (view_index == -1) @@ -1011,8 +1009,6 @@ void LauncherView::ButtonPressed(views::Button* sender, return; } - if (!delegate_) - return; int view_index = view_model_->GetIndexOfView(sender); // May be -1 while in the process of animating closed. if (view_index == -1) @@ -1054,9 +1050,6 @@ void LauncherView::ButtonPressed(views::Button* sender, void LauncherView::ShowContextMenuForView(views::View* source, const gfx::Point& point) { - if (!delegate_) - return; - int view_index = view_model_->GetIndexOfView(source); if (view_index != -1 && model_->items()[view_index].type == TYPE_APP_LIST) { |