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

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

Issue 581583003: Remove flag --disable-genius-app since it's been public launched for several milestones (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/chrome_pages.cc
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index 7b7243b7fca0298b3e5f2b31343ef1e904dee6d0..093889d53e32b7b285fd092b23b444449f7c35a7 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -36,7 +36,6 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/genius_app/app_id.h"
-#include "chromeos/chromeos_switches.h"
#include "extensions/browser/extension_registry.h"
#endif
@@ -76,16 +75,12 @@ void ShowHelpImpl(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(chromeos::switches::kDisableGeniusApp)) {
- const extensions::Extension* extension =
- extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
- genius_app::kGeniusAppId,
- extensions::ExtensionRegistry::EVERYTHING);
- OpenApplication(AppLaunchParams(profile, extension, 0, host_desktop_type));
- return;
- }
-#endif
+ const extensions::Extension* extension =
+ extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
+ genius_app::kGeniusAppId,
+ extensions::ExtensionRegistry::EVERYTHING);
+ OpenApplication(AppLaunchParams(profile, extension, 0, host_desktop_type));
+#else
GURL url;
switch (source) {
case HELP_SOURCE_KEYBOARD:
@@ -107,6 +102,7 @@ void ShowHelpImpl(Browser* browser,
browser = displayer->browser();
}
ShowSingletonTab(browser, url);
+#endif
}
} // namespace
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698