diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 18:55:19 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 18:55:19 +0000 |
| commit | b882b2ee87dc7ba66f10393a9dd92406aee85247 (patch) | |
| tree | f41161e3a3ba076a9f889186b8ba7f8ad4112642 /apps/app_lifetime_monitor.cc | |
| parent | b33a48378ec5d1946331ca4edbb7e3403b7f4efd (diff) | |
| download | chromium_src-b882b2ee87dc7ba66f10393a9dd92406aee85247.zip chromium_src-b882b2ee87dc7ba66f10393a9dd92406aee85247.tar.gz chromium_src-b882b2ee87dc7ba66f10393a9dd92406aee85247.tar.bz2 | |
Revert 250826 "Remove Profile dependency from apps::ShellWindow"
Speculative revert for failures:
http://build.chromium.org/p/chromium.win/builders/Win7%20Sync%20x64/builds/11201
> Remove Profile dependency from apps::ShellWindow
>
> Part of the effort to remove src/chrome dependencies from src/{apps, extensions}
>
> BUG=341690
> TBR=tapted@chromium.org,stevenjb@chromium.org
>
> Review URL: https://codereview.chromium.org/157813007
TBR=rockot@chromium.org
Review URL: https://codereview.chromium.org/163913004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_lifetime_monitor.cc')
| -rw-r--r-- | apps/app_lifetime_monitor.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_lifetime_monitor.cc b/apps/app_lifetime_monitor.cc index f2bb345..41d7f6b 100644 --- a/apps/app_lifetime_monitor.cc +++ b/apps/app_lifetime_monitor.cc @@ -82,8 +82,8 @@ void AppLifetimeMonitor::OnShellWindowAdded(ShellWindow* shell_window) { return; ShellWindowRegistry::ShellWindowList windows = - ShellWindowRegistry::Get(shell_window->browser_context()) - ->GetShellWindowsForApp(shell_window->extension_id()); + ShellWindowRegistry::Get(shell_window->profile())-> + GetShellWindowsForApp(shell_window->extension_id()); if (windows.size() == 1) NotifyAppActivated(shell_window->extension_id()); } @@ -92,8 +92,8 @@ void AppLifetimeMonitor::OnShellWindowIconChanged(ShellWindow* shell_window) {} void AppLifetimeMonitor::OnShellWindowRemoved(ShellWindow* shell_window) { ShellWindowRegistry::ShellWindowList windows = - ShellWindowRegistry::Get(shell_window->browser_context()) - ->GetShellWindowsForApp(shell_window->extension_id()); + ShellWindowRegistry::Get(shell_window->profile())-> + GetShellWindowsForApp(shell_window->extension_id()); if (windows.empty()) NotifyAppDeactivated(shell_window->extension_id()); } |