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

Unified Diff: apps/shell/browser/shell_content_browser_client.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_content_browser_client.h
diff --git a/apps/shell/browser/shell_content_browser_client.h b/apps/shell/browser/shell_content_browser_client.h
index 102173f697d5bef3e3fc503a5731ec1d6e0e6a71..dadc1a708c63fc22211f0ff8e8055f37cb87bbff 100644
--- a/apps/shell/browser/shell_content_browser_client.h
+++ b/apps/shell/browser/shell_content_browser_client.h
@@ -5,6 +5,7 @@
#ifndef APPS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
#define APPS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
+#include "apps/shell/common/start_callback.h"
#include "base/compiler_specific.h"
#include "content/public/browser/content_browser_client.h"
@@ -24,7 +25,7 @@ class ShellBrowserMainParts;
// Content module browser process support for app_shell.
class ShellContentBrowserClient : public content::ContentBrowserClient {
public:
- ShellContentBrowserClient();
+ explicit ShellContentBrowserClient(StartCallback* start_callback);
virtual ~ShellContentBrowserClient();
// Returns the single instance.
@@ -64,6 +65,8 @@ class ShellContentBrowserClient : public content::ContentBrowserClient {
// Owned by content::BrowserMainLoop.
ShellBrowserMainParts* browser_main_parts_;
+ StartCallback* start_callback_; // now owned
James Cook 2014/05/08 21:27:24 "no*w* owned" -> "Not owned."
oshima 2014/05/08 23:57:03 Done.
+
DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient);
};

Powered by Google App Engine
This is Rietveld 408576698