summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorjcivelli@google.com <jcivelli@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 23:12:33 +0000
committerjcivelli@google.com <jcivelli@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 23:12:33 +0000
commitcfe5c1375a0dafe47ffb4b9223d33253fc01e8fa (patch)
tree15e23a948bbec2ee6b20d9a95645a477279e7bf9 /chrome/browser/browser.cc
parentddf8a4b03ca007cc55ead2000aa6b54d0319cd56 (diff)
downloadchromium_src-cfe5c1375a0dafe47ffb4b9223d33253fc01e8fa.zip
chromium_src-cfe5c1375a0dafe47ffb4b9223d33253fc01e8fa.tar.gz
chromium_src-cfe5c1375a0dafe47ffb4b9223d33253fc01e8fa.tar.bz2
Porting the app launcher to Windows, and adding an experimental flag
so the app launcher shows when you open a new tab. Also removing the graying-out of the browser when the app launcher is showng for now, as it is not clear how to make it cross-platform. BUG=None TEST=Start Chrome with --app-launcher-new-tab. Opening a new tab should bring the app launcher (still a prototype at this point). Review URL: http://codereview.chromium.org/1145001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index f2779af..d384107 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -98,6 +98,7 @@
#include "chrome/browser/task_manager.h"
#include "chrome/browser/user_data_manager.h"
#include "chrome/browser/view_ids.h"
+#include "chrome/browser/views/app_launcher.h"
#include "chrome/browser/views/location_bar_view.h"
#endif // OS_WIN
@@ -1028,6 +1029,13 @@ void Browser::CloseWindow() {
void Browser::NewTab() {
UserMetrics::RecordAction("NewTab", profile_);
+#if defined(OS_WIN)
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAppLauncherForNewTab)) {
+ AppLauncher::Show(this);
+ return;
+ }
+#endif
if (type() == TYPE_NORMAL) {
AddBlankTab(true);
} else {