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"

[Lei Zhang, 2014/08/22 22:39:50]

You should #ifdef these two files to flush out any other extension code in the
file with compile errors.

 #include "extensions/browser/process_manager.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserContext;
 using content::JavaScriptDialogManager;
 using content::WebContents;
 using extensions::Extension;
 
 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)
 }
+#endif  // 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)
+#endif  // ENABLE_EXTENSIONS

[Lei Zhang, 2014/08/22 22:39:50]

nit: I think most people do // defined(FOO)

[David Yen, 2014/08/22 23:03:58]

Done.

 }
 
 // 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) {
+#if defined(ENABLE_EXTENSIONS)

[msw, 2014/08/22 22:36:10]

I'm actually not sure what build errors you'd see by omitting these guards.
Further, these shoudn't even be called if |GetExtensionForWebContents| is
returning NULL and blocking the calls below. What am I missing?

[David Yen, 2014/08/22 23:05:52]

Even though technically it can never be called, there is a linker error on
pm->IncrementalLazyKeepaliveCount() and pm->DecrementLazyKeepaliveCount().

   DCHECK(extension);
   DCHECK(web_contents);
   extensions::ProcessManager* pm = GetExtensionsProcessManager(web_contents);
   if (pm)
     pm->IncrementLazyKeepaliveCount(extension);
+#endif  // ENABLE_EXTENSIONS
 }
 
 // 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) {
+#if defined(ENABLE_EXTENSIONS)
   DCHECK(extension);
   DCHECK(web_contents);
   extensions::ProcessManager* pm = GetExtensionsProcessManager(web_contents);
   if (pm)
     pm->DecrementLazyKeepaliveCount(extension);
+#endif  // 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,
@@ skipping 87 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);

[Lei Zhang, 2014/08/22 22:39:50]

As I mentioned on the other CL, maybe pull all the GetExtensionForWebContents()
calls into {Incre,Decre}mentLazyKeepaliveCount() ?

[David Yen, 2014/08/22 23:03:58]

Done.

   if (extension)
     IncrementLazyKeepaliveCount(extension, web_contents);
 
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
       web_contents,
       &javascript_dialog_extra_data_,
       dialog_title,
       message_type,
       message_text,
       default_prompt_text,
@@ skipping 118 matching lines @@
     DecrementLazyKeepaliveCount(extension, web_contents);
 
   callback.Run(success, user_input);
 }
 
 }  // namespace
 
 content::JavaScriptDialogManager* GetJavaScriptDialogManagerInstance() {
   return ChromeJavaScriptDialogManager::GetInstance();
 }