Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: ash/shell/content/client/shell_browser_main_parts.h

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase Created 3 years, 9 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:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
6 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 13 matching lines...) Expand all
24 } 24 }
25 25
26 namespace wm { 26 namespace wm {
27 class WMState; 27 class WMState;
28 } 28 }
29 29
30 namespace ash { 30 namespace ash {
31 namespace shell { 31 namespace shell {
32 32
33 class ExampleAppListPresenter; 33 class ExampleAppListPresenter;
34 class ExampleSessionControllerClient;
34 class ShellDelegateImpl; 35 class ShellDelegateImpl;
35 class WindowWatcher; 36 class WindowWatcher;
36 37
37 class ShellBrowserMainParts : public content::BrowserMainParts { 38 class ShellBrowserMainParts : public content::BrowserMainParts {
38 public: 39 public:
39 explicit ShellBrowserMainParts(const content::MainFunctionParams& parameters); 40 explicit ShellBrowserMainParts(const content::MainFunctionParams& parameters);
40 ~ShellBrowserMainParts() override; 41 ~ShellBrowserMainParts() override;
41 42
42 // Overridden from content::BrowserMainParts: 43 // Overridden from content::BrowserMainParts:
43 void PreMainMessageLoopStart() override; 44 void PreMainMessageLoopStart() override;
44 void PostMainMessageLoopStart() override; 45 void PostMainMessageLoopStart() override;
45 void ToolkitInitialized() override; 46 void ToolkitInitialized() override;
46 void PreMainMessageLoopRun() override; 47 void PreMainMessageLoopRun() override;
47 bool MainMessageLoopRun(int* result_code) override; 48 bool MainMessageLoopRun(int* result_code) override;
48 void PostMainMessageLoopRun() override; 49 void PostMainMessageLoopRun() override;
49 50
50 content::ShellBrowserContext* browser_context() { 51 content::ShellBrowserContext* browser_context() {
51 return browser_context_.get(); 52 return browser_context_.get();
52 } 53 }
53 54
54 private: 55 private:
55 std::unique_ptr<net::NetLog> net_log_; 56 std::unique_ptr<net::NetLog> net_log_;
56 std::unique_ptr<content::ShellBrowserContext> browser_context_; 57 std::unique_ptr<content::ShellBrowserContext> browser_context_;
57 std::unique_ptr<views::ViewsDelegate> views_delegate_; 58 std::unique_ptr<views::ViewsDelegate> views_delegate_;
58 std::unique_ptr<ash::shell::WindowWatcher> window_watcher_; 59 std::unique_ptr<ash::shell::WindowWatcher> window_watcher_;
59 ShellDelegateImpl* delegate_; // owned by Shell 60 ShellDelegateImpl* delegate_; // owned by Shell
60 std::unique_ptr<wm::WMState> wm_state_; 61 std::unique_ptr<wm::WMState> wm_state_;
61 std::unique_ptr<ExampleAppListPresenter> example_app_list_presenter_; 62 std::unique_ptr<ExampleAppListPresenter> example_app_list_presenter_;
63 std::unique_ptr<ExampleSessionControllerClient>
64 example_session_controller_client_;
62 65
63 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 66 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
64 }; 67 };
65 68
66 } // namespace shell 69 } // namespace shell
67 } // namespace ash 70 } // namespace ash
68 71
69 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 72 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698