chrome/browser/chrome_browser_main_extra_parts_ash.cc - Issue 10409022: Move application lifetime functionality off BrowserList.

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: chrome/browser/chrome_browser_main_extra_parts_ash.cc

Issue 10409022: Move application lifetime functionality off BrowserList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/chrome_browser_main_extra_parts_ash.cc

===================================================================

--- chrome/browser/chrome_browser_main_extra_parts_ash.cc (revision 137868)

+++ chrome/browser/chrome_browser_main_extra_parts_ash.cc (working copy)

@@ -10,7 +10,7 @@

#include "ash/wm/key_rewriter_event_filter.h"

#include "ash/wm/property_util.h"

#include "base/command_line.h"

-#include "chrome/browser/ui/browser_list.h"

+#include "chrome/browser/lifetime/application_lifetime.h"

#include "chrome/browser/ui/views/ash/caps_lock_handler.h"

#include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"

#include "chrome/browser/ui/views/ash/key_rewriter.h"

@@ -77,8 +77,9 @@

scoped_ptr<ash::VolumeControlDelegate>(new VolumeController).Pass());

if (!CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kDisableZeroBrowsersOpenForTests))

- BrowserList::StartKeepAlive();

+ switches::kDisableZeroBrowsersOpenForTests)) {

+ browser::StartKeepAlive();

+ }

#endif

gesture_handler_.reset(new UserGestureHandler);

aura::client::SetUserGestureClient(

« no previous file with comments | « chrome/browser/browser_shutdown.cc ('k') | chrome/browser/chrome_browser_main_posix.cc » ('j') | no next file with comments »