Fixed javascript_dialog_manager to compile when extensions are disabled.

chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.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/ui/app_modal_dialogs/javascript_dialog_manager.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/singleton.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/javascript_message_type.h"
-#include "extensions/browser/extension_system.h"
-#include "extensions/browser/process_manager.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if defined(ENABLE_EXTENSIONS)
+#include "extensions/browser/extension_system.h"
+#include "extensions/browser/process_manager.h"
+#endif  // defined(ENABLE_EXTENSIONS)
+
 using content::BrowserContext;
 using content::JavaScriptDialogManager;
 using content::WebContents;
+
+#if defined(ENABLE_EXTENSIONS)
 using extensions::Extension;
+#endif  // defined(ENABLE_EXTENSIONS)
 
 namespace {
 
+#if defined(ENABLE_EXTENSIONS)
 // Returns the ProcessManager for the browser context from |web_contents|.
 extensions::ProcessManager* GetExtensionsProcessManager(
     WebContents* web_contents) {
-#if defined(ENABLE_EXTENSIONS)
   return extensions::ExtensionSystem::Get(
       web_contents->GetBrowserContext())->process_manager();
-#else
-  return NULL;
-#endif  // defined(ENABLE_EXTENSIONS)
 }
 
 // Returns the extension associated with |web_contents| or NULL if there is no
 // associated extension (or extensions are not supported).
 const Extension* GetExtensionForWebContents(WebContents* web_contents) {
-#if defined(ENABLE_EXTENSIONS)
   extensions::ProcessManager* pm = GetExtensionsProcessManager(web_contents);
   return pm->GetExtensionForRenderViewHost(web_contents->GetRenderViewHost());
-#else
-  return NULL;
-#endif  // defined(ENABLE_EXTENSIONS)
 }
 
 // Keeps an |extension| from shutting down its lazy background page. If an
 // extension opens a dialog its lazy background page must stay alive until the
 // dialog closes.
-void IncrementLazyKeepaliveCount(const Extension* extension,
-                                 WebContents* web_contents) {
-  DCHECK(extension);
+void IncrementLazyKeepaliveCount(WebContents* web_contents) {

[Lei Zhang, 2014/08/22 23:19:01]

This can be a no-op function when extensions are disabled, but it needs to be
defined. Then you don't need to wrap all the callers in an #ifdef.

+  const Extension* extension = GetExtensionForWebContents(web_contents);
+  if (extension == NULL)
+    return;
+
   DCHECK(web_contents);
   extensions::ProcessManager* pm = GetExtensionsProcessManager(web_contents);
   if (pm)
     pm->IncrementLazyKeepaliveCount(extension);
 }
 
 // Allows an |extension| to shut down its lazy background page after a dialog
 // closes (if nothing else is keeping it open).
-void DecrementLazyKeepaliveCount(const Extension* extension,
-                                 WebContents* web_contents) {
-  DCHECK(extension);
+void DecrementLazyKeepaliveCount(WebContents* web_contents) {
+  const Extension* extension = GetExtensionForWebContents(web_contents);
+  if (extension == NULL)
+    return;
+
   DCHECK(web_contents);
   extensions::ProcessManager* pm = GetExtensionsProcessManager(web_contents);
   if (pm)
     pm->DecrementLazyKeepaliveCount(extension);
 }
+#endif  // defined(ENABLE_EXTENSIONS)
 
 class ChromeJavaScriptDialogManager : public JavaScriptDialogManager {
  public:
   static ChromeJavaScriptDialogManager* GetInstance();
 
   virtual void RunJavaScriptDialog(
       WebContents* web_contents,
       const GURL& origin_url,
       const std::string& accept_lang,
       content::JavaScriptMessageType message_type,
@@ skipping 86 matching lines @@
           chrome::kJavaScriptMessageExpectedDelay)) {
     display_suppress_checkbox = true;
   } else {
     display_suppress_checkbox = false;
   }
 
   bool is_alert = message_type == content::JAVASCRIPT_MESSAGE_TYPE_ALERT;
   base::string16 dialog_title =
       GetTitle(web_contents, origin_url, accept_lang, is_alert);
 
-  const Extension* extension = GetExtensionForWebContents(web_contents);
-  if (extension)
-    IncrementLazyKeepaliveCount(extension, web_contents);
+#if defined(ENABLE_EXTENSIONS)
+  IncrementLazyKeepaliveCount(web_contents);
+#endif  // defined(ENABLE_EXTENSIONS)
 
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
       web_contents,
       &javascript_dialog_extra_data_,
       dialog_title,
       message_type,
       message_text,
       default_prompt_text,
       display_suppress_checkbox,
       false,  // is_before_unload_dialog
       false,  // is_reload
       base::Bind(&ChromeJavaScriptDialogManager::OnDialogClosed,
                  base::Unretained(this), web_contents, callback)));
 }
 
 void ChromeJavaScriptDialogManager::RunBeforeUnloadDialog(
     WebContents* web_contents,
     const base::string16& message_text,
     bool is_reload,
     const DialogClosedCallback& callback) {
   const base::string16 title = l10n_util::GetStringUTF16(is_reload ?
       IDS_BEFORERELOAD_MESSAGEBOX_TITLE : IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE);
   const base::string16 footer = l10n_util::GetStringUTF16(is_reload ?
       IDS_BEFORERELOAD_MESSAGEBOX_FOOTER : IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER);
 
   base::string16 full_message =
       message_text + base::ASCIIToUTF16("\n\n") + footer;
 
-  const Extension* extension = GetExtensionForWebContents(web_contents);
-  if (extension)
-    IncrementLazyKeepaliveCount(extension, web_contents);
+#if defined(ENABLE_EXTENSIONS)
+  IncrementLazyKeepaliveCount(web_contents);
+#endif  // defined(ENABLE_EXTENSIONS)
 
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
       web_contents,
       &javascript_dialog_extra_data_,
       title,
       content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM,
       full_message,
       base::string16(),  // default_prompt_text
       false,       // display_suppress_checkbox
       true,        // is_before_unload_dialog
@@ skipping 37 matching lines @@
     bool is_alert) {
   // If the URL hasn't any host, return the default string.
   if (!origin_url.has_host()) {
       return l10n_util::GetStringUTF16(
           is_alert ? IDS_JAVASCRIPT_ALERT_DEFAULT_TITLE
                    : IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE);
   }
 
   // For extensions, show the extension name, but only if the origin of
   // the alert matches the top-level WebContents.
+#if defined(ENABLE_EXTENSIONS)
   const Extension* extension = GetExtensionForWebContents(web_contents);
   if (extension &&
       web_contents->GetLastCommittedURL().GetOrigin() == origin_url) {
     return base::UTF8ToUTF16(extension->name());
   }
+#endif  // defined(ENABLE_EXTENSIONS)
 
   // Otherwise, return the formatted URL.
   // In this case, force URL to have LTR directionality.
   base::string16 url_string = net::FormatUrl(origin_url, accept_lang);
   return l10n_util::GetStringFUTF16(
       is_alert ? IDS_JAVASCRIPT_ALERT_TITLE
       : IDS_JAVASCRIPT_MESSAGEBOX_TITLE,
       base::i18n::GetDisplayStringInLTRDirectionality(url_string));
 }
 
@@ skipping 11 matching lines @@
 }
 
 void ChromeJavaScriptDialogManager::OnDialogClosed(
     WebContents* web_contents,
     DialogClosedCallback callback,
     bool success,
     const base::string16& user_input) {
   // If an extension opened this dialog then the extension may shut down its
   // lazy background page after the dialog closes. (Dialogs are closed before
   // their WebContents is destroyed so |web_contents| is still valid here.)
-  const Extension* extension = GetExtensionForWebContents(web_contents);
-  if (extension)
-    DecrementLazyKeepaliveCount(extension, web_contents);
+#if defined(ENABLE_EXTENSIONS)
+  DecrementLazyKeepaliveCount(web_contents);
+#endif  // defined(ENABLE_EXTENSIONS)
 
   callback.Run(success, user_input);
 }
 
 }  // namespace
 
 content::JavaScriptDialogManager* GetJavaScriptDialogManagerInstance() {
   return ChromeJavaScriptDialogManager::GetInstance();
 }