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

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

Issue 2576913002: Use mojo app list interfaces for mash and classic ash. (Closed)
Patch Set: Sync and rebase Created 3 years, 11 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
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell/content/client/shell_browser_main_parts.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 12 matching lines...) Expand all
23 class ViewsDelegate; 23 class ViewsDelegate;
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 ShellDelegateImpl; 34 class ShellDelegateImpl;
34 class WindowWatcher; 35 class WindowWatcher;
35 36
36 class ShellBrowserMainParts : public content::BrowserMainParts { 37 class ShellBrowserMainParts : public content::BrowserMainParts {
37 public: 38 public:
38 explicit ShellBrowserMainParts(const content::MainFunctionParams& parameters); 39 explicit ShellBrowserMainParts(const content::MainFunctionParams& parameters);
39 ~ShellBrowserMainParts() override; 40 ~ShellBrowserMainParts() override;
40 41
41 // Overridden from content::BrowserMainParts: 42 // Overridden from content::BrowserMainParts:
42 void PreMainMessageLoopStart() override; 43 void PreMainMessageLoopStart() override;
43 void PostMainMessageLoopStart() override; 44 void PostMainMessageLoopStart() override;
44 void ToolkitInitialized() override; 45 void ToolkitInitialized() override;
45 void PreMainMessageLoopRun() override; 46 void PreMainMessageLoopRun() override;
46 bool MainMessageLoopRun(int* result_code) override; 47 bool MainMessageLoopRun(int* result_code) override;
47 void PostMainMessageLoopRun() override; 48 void PostMainMessageLoopRun() override;
48 49
49 content::ShellBrowserContext* browser_context() { 50 content::ShellBrowserContext* browser_context() {
50 return browser_context_.get(); 51 return browser_context_.get();
51 } 52 }
52 53
53 private: 54 private:
54 std::unique_ptr<net::NetLog> net_log_; 55 std::unique_ptr<net::NetLog> net_log_;
55 std::unique_ptr<content::ShellBrowserContext> browser_context_; 56 std::unique_ptr<content::ShellBrowserContext> browser_context_;
56 std::unique_ptr<views::ViewsDelegate> views_delegate_; 57 std::unique_ptr<views::ViewsDelegate> views_delegate_;
57 std::unique_ptr<ash::shell::WindowWatcher> window_watcher_; 58 std::unique_ptr<ash::shell::WindowWatcher> window_watcher_;
58 ShellDelegateImpl* delegate_; // owned by Shell 59 ShellDelegateImpl* delegate_; // owned by Shell
59 std::unique_ptr<wm::WMState> wm_state_; 60 std::unique_ptr<wm::WMState> wm_state_;
61 std::unique_ptr<ExampleAppListPresenter> example_app_list_presenter_;
60 62
61 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 63 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
62 }; 64 };
63 65
64 } // namespace shell 66 } // namespace shell
65 } // namespace ash 67 } // namespace ash
66 68
67 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 69 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell/content/client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698