Refactor ViewsDelegate singleton

ash/shell/content_client/shell_browser_main_parts.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_main_parts.h"
 
 namespace base {
 class Thread;
 }
 
 namespace content {
 class ShellBrowserContext;
 struct MainFunctionParams;
 }
 
 namespace net {
 class NetLog;
 }
 
+namespace views {
+class ViewsDelegate;
+}
+
 namespace wm {
 class WMState;
 }
 
 namespace ash {
 namespace shell {
 
 class ShellDelegateImpl;
 class WindowWatcher;
 
@@ skipping 12 matching lines @@
   void PostMainMessageLoopRun() override;
 
   content::ShellBrowserContext* browser_context() {
     return browser_context_.get();
   }
 
  private:
   scoped_ptr<net::NetLog> net_log_;
   scoped_ptr<content::ShellBrowserContext> browser_context_;
   scoped_ptr<ash::shell::WindowWatcher> window_watcher_;
+  scoped_ptr<views::ViewsDelegate> views_delegate_;

[sky, 2015/06/08 20:22:42]

Seems like this should be before window_watcher_.

[mohsen, 2015/06/08 20:46:09]

Done, but is it because it is set before window_wathcer_ in the .cc file? Or
there is some other reason?

[sky, 2015/06/08 20:48:03]

I would think anything using ash many be using aura/views, and you really want
the delegate destroyed after that.

[mohsen, 2015/06/09 02:17:23]

I see. Now, I destroy the delegate in PostMainMessageLoopRun. Please take a
look...

   ShellDelegateImpl* delegate_;  // owned by Shell
   scoped_ptr<wm::WMState> wm_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
 };
 
 }  // namespace shell
 }  // namespace ash
 
 #endif  // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_