Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / chrome_pages.cc

diff --git a/src/chrome/browser/ui/chrome_pages.cc b/src/chrome/browser/ui/chrome_pages.cc
index 4cc02c0..093889d 100644 (file)
--- a/src/chrome/browser/ui/chrome_pages.cc
+++ b/src/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
@@ -311,7 +307,7 @@ void ShowBrowserSignin(Browser* browser, signin::Source source) {
       SigninManagerFactory::GetForProfile(original_profile);
   DCHECK(manager->IsSigninAllowed());
   // If we're signed in, just show settings.
-  if (!manager->GetAuthenticatedUsername().empty()) {
+  if (manager->IsAuthenticated()) {
     ShowSettings(browser);
   } else {
     // If the browser's profile is an incognito profile, make sure to use