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

Unified Diff: chrome/browser/browser.cc

Issue 2060004: Removing the app launcher button on ChromeOS (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: One more clean up Created 10 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
« no previous file with comments | « chrome/browser/browser.h ('k') | chrome/browser/chromeos/frame/browser_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser.cc
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index f375ce068a19332d9b40560f7f8a46620ef74e3b..ce7cae7604a619397f21e56dbc080ef5fd1072f3 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -111,6 +111,10 @@
#include "chrome/browser/cocoa/find_pasteboard.h"
#endif
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/views/app_launcher.h"
+#endif
+
using base::TimeDelta;
// How long we wait before updating the browser chrome while loading a page.
@@ -1045,6 +1049,21 @@ void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
command_updater_.UpdateCommandEnabled(IDC_SHOW_PAGE_MENU, show_main_ui);
}
+bool Browser::OpenAppsPanelAsNewTab() {
+#if defined(OS_CHROMEOS) || defined(OS_WIN)
+ CommandLine* command_line = CommandLine::ForCurrentProcess();
+ if (command_line->HasSwitch(switches::kDisableAppsPanel) ||
+ (!browser_defaults::kShowAppsPanelForNewTab &&
+ !command_line->HasSwitch(switches::kAppsPanel))) {
+ return false;
+ }
+ AppLauncher::ShowForNewTab(this, std::string());
+ return true;
+#endif // OS_CHROMEOS || OS_WIN
+
+ return false;
+}
+
///////////////////////////////////////////////////////////////////////////////
// Browser, Assorted browser commands:
@@ -1248,12 +1267,10 @@ void Browser::CloseWindow() {
void Browser::NewTab() {
UserMetrics::RecordAction(UserMetricsAction("NewTab"), profile_);
-#if defined(OS_WIN)
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppsPanel)) {
- AppLauncher::ShowForNewTab(this, std::string());
+
+ if (OpenAppsPanelAsNewTab())
return;
- }
-#endif
+
if (type() == TYPE_NORMAL) {
AddBlankTab(true);
} else {
« no previous file with comments | « chrome/browser/browser.h ('k') | chrome/browser/chromeos/frame/browser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698