diff options
author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 20:26:47 +0000 |
---|---|---|
committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 20:26:47 +0000 |
commit | a5fc73eec17220fb061c6dbbcc36846f386d9bcb (patch) | |
tree | c4de5ff6b243680d8514a6337a0deaebc379e960 /apps/app_lifetime_monitor.cc | |
parent | 0b4731f8b49724c2f389921c4faae26f352f180c (diff) | |
download | chromium_src-a5fc73eec17220fb061c6dbbcc36846f386d9bcb.zip chromium_src-a5fc73eec17220fb061c6dbbcc36846f386d9bcb.tar.gz chromium_src-a5fc73eec17220fb061c6dbbcc36846f386d9bcb.tar.bz2 |
Revert 251094 "Revert 250826 "Remove Profile dependency from app..."
Speculative re-land. Sync tests are passing now, but we're not sure
which revert fixed them. Let's see if this makes the tree red again
or not.
> 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
TBR=asvitkine@chromium.org
Review URL: https://codereview.chromium.org/164613002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251112 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 41d7f6b..f2bb345 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->profile())-> - GetShellWindowsForApp(shell_window->extension_id()); + ShellWindowRegistry::Get(shell_window->browser_context()) + ->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->profile())-> - GetShellWindowsForApp(shell_window->extension_id()); + ShellWindowRegistry::Get(shell_window->browser_context()) + ->GetShellWindowsForApp(shell_window->extension_id()); if (windows.empty()) NotifyAppDeactivated(shell_window->extension_id()); } |