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

Unified Diff: chrome/browser/ui/chrome_pages.cc

Issue 23548023: Add a new component app Guide to Chrome (code name GeniusApp) to replace HelpApp. Add a command lin… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 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
Index: chrome/browser/ui/chrome_pages.cc
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index 34d9b6bc1c8eebd88a09ef99a98e4a27d5b24e27..b9f3c8af83a7db0d1309eaaf8785c198a9ef1d4b 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -4,20 +4,25 @@
#include "chrome/browser/ui/chrome_pages.h"
+#include "base/command_line.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/download/download_shelf.h"
+#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/signin/signin_manager.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/ui/singleton_tabs.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/webui/options/content_settings_handler.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/user_metrics.h"
#include "google_apis/gaia/gaia_urls.h"
@@ -28,6 +33,10 @@
#include "chrome/browser/enumerate_modules_model_win.h"
#endif
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/genius_app/app_id.h"
+#endif
+
using content::UserMetricsAction;
namespace chrome {
@@ -126,6 +135,16 @@ void ShowConflicts(Browser* browser) {
void ShowHelp(Browser* browser, HelpSource source) {
content::RecordAction(UserMetricsAction("ShowHelpTab"));
+#if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)
+ const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ if (!command_line->HasSwitch(switches::kDisableGeniusApp)) {
+ Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
+ const extensions::Extension* extension = profile->GetExtensionService()->
+ GetInstalledExtension(genius_app::kGeniusAppId);
+ OpenApplication(AppLaunchParams(profile, extension, 0));
+ return;
+ }
+#endif
GURL url;
switch (source) {
case HELP_SOURCE_KEYBOARD:

Powered by Google App Engine
This is Rietveld 408576698