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

Unified Diff: apps/shell/browser/shell_browser_main_parts.h

Issue 270763002: Minimal athena shell main (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/shell/browser/shell_browser_main_delegate.h ('k') | apps/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/browser/shell_browser_main_parts.h
diff --git a/apps/shell/browser/shell_browser_main_parts.h b/apps/shell/browser/shell_browser_main_parts.h
index 4bc18b2b3b73f7117805f5755188aa81b9368e03..d8a2c118f5b9567d80a5ec2539db7172043a9b50 100644
--- a/apps/shell/browser/shell_browser_main_parts.h
+++ b/apps/shell/browser/shell_browser_main_parts.h
@@ -34,6 +34,7 @@ class NetLog;
namespace apps {
class ShellBrowserContext;
+class ShellBrowserMainDelegate;
class ShellDesktopController;
class ShellExtensionsClient;
@@ -45,8 +46,8 @@ class ShellNetworkController;
class ShellBrowserMainParts : public content::BrowserMainParts,
public aura::WindowTreeHostObserver {
public:
- explicit ShellBrowserMainParts(
- const content::MainFunctionParams& parameters);
+ ShellBrowserMainParts(const content::MainFunctionParams& parameters,
+ ShellBrowserMainDelegate* browser_main_delegate);
virtual ~ShellBrowserMainParts();
ShellBrowserContext* browser_context() {
@@ -96,6 +97,8 @@ class ShellBrowserMainParts : public content::BrowserMainParts,
// in MainMessageLoopRun. If false, it has already been run.
bool run_message_loop_;
+ scoped_ptr<ShellBrowserMainDelegate> browser_main_delegate_;
+
DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
};
« no previous file with comments | « apps/shell/browser/shell_browser_main_delegate.h ('k') | apps/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698