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

Unified Diff: content/browser/browser_main_loop.h

Issue 8596015: Revert 110710 - Add ChromeBrowserMainExtraParts for non main parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « chrome/test/functional/PYAUTO_TESTS ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 7dac5006ae0f13b3be95586edb4fcf589dfb7123..0abe7e158f1dcd0fa7b533e4ba29af36d30bc5f6 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -6,6 +6,8 @@
#define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
#pragma once
+#include <vector>
+
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
@@ -53,7 +55,10 @@ class BrowserMainLoop {
const CommandLine& parsed_command_line_;
int result_code_;
- scoped_ptr<BrowserMainParts> parts_;
+ // Vector of BrowserMainParts set by CreateBrowserMainParts ------------------
+ // The BrowserParts fucntions for each part are called in the order added.
+ // They are released (destroyed) in the reverse order.
+ std::vector<BrowserMainParts*> parts_list_;
// Members initialized in |MainMessageLoopStart()| ---------------------------
scoped_ptr<MessageLoop> main_message_loop_;
« no previous file with comments | « chrome/test/functional/PYAUTO_TESTS ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698