ash/launcher/overflow_bubble.cc - Issue 11476033: [Launcher per display] Removed Shell::status_area_widget(), system_tray()

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

Unified Diff: ash/launcher/overflow_bubble.cc

Issue 11476033: [Launcher per display] Removed Shell::status_area_widget(), system_tray() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix style Created 8 years 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 side-by-side diff with in-line comments

Download patch

Index: ash/launcher/overflow_bubble.cc

diff --git a/ash/launcher/overflow_bubble.cc b/ash/launcher/overflow_bubble.cc

index 7c14f8e3de4882b1cdd2c741463ce2334f690b44..d2f889e09ab89c5c71fca94417b472b55d17e3c3 100644

--- a/ash/launcher/overflow_bubble.cc

+++ b/ash/launcher/overflow_bubble.cc

@@ -8,9 +8,11 @@

#include "ash/launcher/launcher_types.h"

#include "ash/launcher/launcher_view.h"

+#include "ash/root_window_controller.h"

#include "ash/system/tray/system_tray.h"

#include "ash/shell.h"

#include "ash/wm/shelf_layout_manager.h"

+#include "ui/aura/root_window.h"

#include "ui/gfx/insets.h"

#include "ui/gfx/screen.h"

#include "ui/views/bubble/bubble_delegate.h"

@@ -258,8 +260,8 @@ void OverflowBubble::Show(LauncherDelegate* delegate,

overflow_start_index);

bubble_ = bubble_view;

- ash::Shell::GetInstance()->system_tray()->InitializeBubbleAnimations(

- bubble_->GetWidget());

+ RootWindowController::ForWindow(anchor->GetWidget()->GetNativeView())->

+ GetSystemTray()->InitializeBubbleAnimations(bubble_->GetWidget());

bubble_->GetWidget()->AddObserver(this);

bubble_->GetWidget()->Show();

}

« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/root_window_controller.h » ('j') | no next file with comments »