summaryrefslogtreecommitdiffstats
path: root/chrome/browser/app_controller_mac.h
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-22 04:52:56 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-22 04:52:56 +0000
commitddf124cb8f239ecfbe2339d16f4e3dc849798d20 (patch)
treeefd60310a937d87d9dfd48816779dad690111d83 /chrome/browser/app_controller_mac.h
parent0f7a0191f603800bbf7e387277ed29a6209063bc (diff)
downloadchromium_src-ddf124cb8f239ecfbe2339d16f4e3dc849798d20.zip
chromium_src-ddf124cb8f239ecfbe2339d16f4e3dc849798d20.tar.gz
chromium_src-ddf124cb8f239ecfbe2339d16f4e3dc849798d20.tar.bz2
Getting perf numbers. Will revert.
BUG=none TEST=none TBR=viettrungluu@chromium.org Review URL: http://codereview.chromium.org/502099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.h')
-rw-r--r--chrome/browser/app_controller_mac.h18
1 files changed, 14 insertions, 4 deletions
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h
index ba04a49..4ff1eb0 100644
--- a/chrome/browser/app_controller_mac.h
+++ b/chrome/browser/app_controller_mac.h
@@ -33,10 +33,12 @@ class Profile;
PreferencesWindowController* prefsController_; // Weak.
AboutWindowController* aboutController_; // Weak.
- // URLs that need to be opened when the app is fully initialized. Because it's
- // only needed during early startup, it points to a valid vector during early
- // startup and is NULL during the rest of app execution.
- scoped_ptr<std::vector<GURL> > pendingURLs_;
+ // If we're told to open URLs (in particular, via |-application:openFiles:| by
+ // Launch Services) before we've launched the browser, we queue them up in
+ // |startupURLs_| so that they can go in the first browser window/tab.
+ // |startupComplete_| is automatically initialized to |NO|.
+ std::vector<GURL> startupURLs_;
+ BOOL startupComplete_;
// Outlets for the close tab/window menu items so that we can adjust the
// commmand-key equivalent depending on the kind of window and how many
@@ -50,6 +52,8 @@ class Profile;
IBOutlet NSMenu* helpMenu_;
}
+@property(readonly, nonatomic) BOOL startupComplete;
+
- (void)didEndMainMessageLoop;
- (Profile*)defaultProfile;
@@ -64,6 +68,12 @@ class Profile;
// Delegate method to return the dock menu.
- (NSMenu*)applicationDockMenu:(NSApplication*)sender;
+// Get the URLs that Launch Services expects the browser to open at startup.
+- (const std::vector<GURL>&)startupURLs;
+
+// Clear the list of startup URLs.
+- (void)clearStartupURLs;
+
@end
#endif