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

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
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..4798452e415329ec9a239314d6317ab3118cab70 100644
--- a/apps/shell/browser/shell_browser_main_parts.h
+++ b/apps/shell/browser/shell_browser_main_parts.h
@@ -5,6 +5,7 @@
#ifndef APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
#define APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
+#include "apps/shell/common/start_callback.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
@@ -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,
+ StartCallback* start_callback);
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_;
+ StartCallback* start_callback_; // not owned
James Cook 2014/05/08 21:27:24 nit: "not owned" -> "Not owned."
oshima 2014/05/08 23:57:03 Done.
+
DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
};

Powered by Google App Engine
This is Rietveld 408576698