diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 10:31:16 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 10:31:16 +0000 |
| commit | 7e41c2b4e96a108d66a39f255b948c2ef2afeb8c (patch) | |
| tree | 748f44aaaef3b93379123a53e23d72f82dfb5837 /chrome/browser/ui/browser_init.cc | |
| parent | c6718cc47e54d8fc3299e866d6cf2b0f3d5ea31d (diff) | |
| download | chromium_src-7e41c2b4e96a108d66a39f255b948c2ef2afeb8c.zip chromium_src-7e41c2b4e96a108d66a39f255b948c2ef2afeb8c.tar.gz chromium_src-7e41c2b4e96a108d66a39f255b948c2ef2afeb8c.tar.bz2 | |
Extension Apps that prefer a panel over a tab, should launch that way when
launched from the Omnibox.
BUG=81379
TEST=Install Scratchpad extension (from Google). Launch it from the Omnibox and it should launch as a panel app. Test Paste and Go also like you normally would (it is affected).
Review URL: http://codereview.chromium.org/6913022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_init.cc')
| -rw-r--r-- | chrome/browser/ui/browser_init.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 71c61f0..16c8b4e 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -768,7 +768,8 @@ bool BrowserInit::LaunchWithProfile::OpenApplicationTab(Profile* profile) { RecordCmdLineAppHistogram(); - TabContents* app_tab = Browser::OpenApplicationTab(profile, extension, NULL); + TabContents* app_tab = Browser::OpenApplicationTab(profile, extension, + NEW_FOREGROUND_TAB); return (app_tab != NULL); } @@ -796,7 +797,7 @@ bool BrowserInit::LaunchWithProfile::OpenApplicationWindow(Profile* profile) { RecordCmdLineAppHistogram(); TabContents* tab_in_app_window = Browser::OpenApplication( - profile, extension, launch_container, NULL); + profile, extension, launch_container, NEW_WINDOW); return (tab_in_app_window != NULL); } @@ -1080,10 +1081,10 @@ class DNSCertProvenanceCheckingInfoBar : public ConfirmInfoBarDelegate { virtual bool Accept() OVERRIDE; private: - DISALLOW_COPY_AND_ASSIGN(DNSCertProvenanceCheckingInfoBar); - static const char kLearnMoreURL[]; TabContents* const tab_contents_; + + DISALLOW_COPY_AND_ASSIGN(DNSCertProvenanceCheckingInfoBar); }; DNSCertProvenanceCheckingInfoBar::DNSCertProvenanceCheckingInfoBar( |