Web Intents: Remove the flag and compile-time define.

chrome/browser/ui/extensions/shell_window.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/extensions/shell_window.h"
 
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_window_controller.h"
@@ skipping 144 matching lines @@
 // TODO(benwells): Rearrange so users of this can call
 // WebContents::set_should_suppress_dialogs(bool) instead of overriding
 // this delegate function.
 bool ShellWindow::ShouldSuppressDialogs() {
   return true;
 }
 
 void ShellWindow::WebIntentDispatch(
     content::WebContents* web_contents,
     content::WebIntentsDispatcher* intents_dispatcher) {
-
-#if defined(ENABLE_WEB_INTENTS)
   if (!web_intents::IsWebIntentsEnabled(profile_))
     return;
 
   contents_wrapper_->web_intent_picker_controller()->SetIntentsDispatcher(
       intents_dispatcher);
   contents_wrapper_->web_intent_picker_controller()->ShowDialog(
       intents_dispatcher->GetIntent().action,
       intents_dispatcher->GetIntent().type);
-#endif  // defined(ENABLE_WEB_INTENTS)
- }
+}
 
 void ShellWindow::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const Extension* unloaded_extension =
           content::Details<UnloadedExtensionInfo>(details)->extension;
       if (extension_ == unloaded_extension)
         Close();
       break;
     }
     case content::NOTIFICATION_APP_TERMINATING:
       Close();
       break;
     default:
       NOTREACHED() << "Received unexpected notification";
   }
 }
 
 ExtensionWindowController* ShellWindow::GetExtensionWindowController() const {
   return extension_window_controller_.get();
 }
 
 void ShellWindow::OnRequest(const ExtensionHostMsg_Request_Params& params) {
   extension_function_dispatcher_.Dispatch(params,
                                           web_contents_->GetRenderViewHost());
 }