diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_init.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_function_dispatcher.cc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index a96d6ff..fe1866f 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -520,6 +520,7 @@ bool BrowserInit::LaunchWithProfile::OpenApplicationURL(Profile* profile) { if (command_line_.HasSwitch(switches::kEnableExtensionApps)) { if (command_line_.HasSwitch(switches::kAppId)) { + // http://crbug.com/37548 // TODO(rafaelw): There are two legitimate cases where the extensions // service could not be ready at this point which need to be handled: // 1) The locale has changed and the manifests stored in the preferences diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index 445a867..36f8651 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -265,8 +265,7 @@ ExtensionFunctionDispatcher::ExtensionFunctionDispatcher( RenderViewHost* render_view_host, Delegate* delegate, const GURL& url) - : ALLOW_THIS_IN_INITIALIZER_LIST( - profile_(render_view_host->process()->profile())), + : profile_(render_view_host->process()->profile()), render_view_host_(render_view_host), delegate_(delegate), url_(url), |