Enable streamlined-apps flag on Chrome for Mac.

chrome/browser/extensions/tab_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/tab_helper.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 130 matching lines @@
 
 bool TabHelper::CanCreateApplicationShortcuts() const {
 #if defined(OS_MACOSX)
   return false;
 #else
   return web_app::IsValidUrl(web_contents()->GetURL());
 #endif
 }
 
 bool TabHelper::CanCreateBookmarkApp() const {
-#if defined(OS_MACOSX)
-  return false;
-#else
   return IsValidBookmarkAppUrl(web_contents()->GetURL());
-#endif
 }
 
 void TabHelper::AddScriptExecutionObserver(ScriptExecutionObserver* observer) {
   script_execution_observers_.AddObserver(observer);
 }
 
 void TabHelper::RemoveScriptExecutionObserver(
     ScriptExecutionObserver* observer) {
   script_execution_observers_.RemoveObserver(observer);
 }
@@ skipping 122 matching lines @@
   // When the WebContents that this is attached to is cloned, give the new clone
   // a TabHelper and copy state over.
   CreateForWebContents(new_web_contents);
   TabHelper* new_helper = FromWebContents(new_web_contents);
 
   new_helper->SetExtensionApp(extension_app());
   new_helper->extension_app_icon_ = extension_app_icon_;
 }
 
 void TabHelper::OnDidGetWebApplicationInfo(const WebApplicationInfo& info) {
-#if !defined(OS_MACOSX)
   web_app_info_ = info;
 
   NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   if (!entry || last_committed_page_id_ != entry->GetPageID())
     return;
   last_committed_page_id_ = -1;
 
   switch (pending_web_app_action_) {
+#if !defined(OS_MACOSX)
     case CREATE_SHORTCUT: {
       chrome::ShowCreateWebAppShortcutsDialog(
           web_contents()->GetTopLevelNativeWindow(),
           web_contents());
       break;
     }
+#endif
     case CREATE_HOSTED_APP: {
       if (web_app_info_.app_url.is_empty())
         web_app_info_.app_url = web_contents()->GetURL();
 
       if (web_app_info_.title.empty())
         web_app_info_.title = web_contents()->GetTitle();
       if (web_app_info_.title.empty())
         web_app_info_.title = base::UTF8ToUTF16(web_app_info_.app_url.spec());
 
       bookmark_app_helper_.reset(new BookmarkAppHelper(
           ExtensionSystem::Get(profile_)->extension_service(),
           web_app_info_, web_contents()));
       bookmark_app_helper_->Create(base::Bind(
           &TabHelper::FinishCreateBookmarkApp, weak_ptr_factory_.GetWeakPtr()));
       break;
     }
     case UPDATE_SHORTCUT: {
       web_app::UpdateShortcutForTabContents(web_contents());
       break;
     }
     default:
       NOTREACHED();

[sky, 2014/12/01 17:21:02]

Is it nos possible to end up here on a mac if pending_web_app_action_ is
CREATE_SHORTCUT?

       break;
   }
 
   // The hosted app action will be cleared once the installation completes or
   // fails.
   if (pending_web_app_action_ != CREATE_HOSTED_APP)
     pending_web_app_action_ = NONE;
-#endif
 }
 
 void TabHelper::OnInlineWebstoreInstall(int install_id,
                                         int return_route_id,
                                         const std::string& webstore_item_id,
                                         const GURL& requestor_url,
                                         int listeners_mask) {
   // Check that the listener is reasonable. We should never get anything other
   // than an install stage listener, a download listener, or both.
   if ((listeners_mask & ~(api::webstore::INSTALL_STAGE_LISTENER |
@@ skipping 243 matching lines @@
   }
 }
 
 void TabHelper::SetTabId(RenderViewHost* render_view_host) {
   render_view_host->Send(
       new ExtensionMsg_SetTabId(render_view_host->GetRoutingID(),
                                 SessionTabHelper::IdForTab(web_contents())));
 }
 
 }  // namespace extensions