Chromium Code Reviews| 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..e69d311fac96d0b8b0db80b681c70966f294469a 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,15 +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; |
| - } |
| + const extensions::Extension* extension = |
| + extensions::ExtensionRegistry::Get(profile)->GetExtensionById( |
| + genius_app::kGeniusAppId, |
| + extensions::ExtensionRegistry::EVERYTHING); |
| + OpenApplication(AppLaunchParams(profile, extension, 0, host_desktop_type)); |
| + return; |
|
sky
2014/09/17 19:43:25
Nuke the return and make 84 a #else.
cylee1
2014/09/18 11:10:30
Done.
|
| #endif |
| GURL url; |
| switch (source) { |