Rename app_modal_dialogs dir to app_modal

components/app_modal/javascript_dialog_manager_impl.h

 // Copyright 2014 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.
+#ifndef COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_IMPL_H_

[msw, 2014/11/17 19:14:41]

nit: blank line above.

[oshima, 2014/11/17 21:40:23]

Done.

+#define COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_IMPL_H_
 
 #include "content/public/browser/javascript_dialog_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
 
 class JavaScriptDialogExtensionsClient;
 class JavaScriptNativeDialogFactory;
 
 class JavaScriptDialogManagerImpl : public content::JavaScriptDialogManager {
  public:
   static JavaScriptDialogManagerImpl* GetInstance();
 
   // JavaScriptDialogManager:
   void RunJavaScriptDialog(content::WebContents* web_contents,
@@ skipping 46 matching lines @@
   // Mapping between the WebContents and their extra data. The key
   // is a void* because the pointer is just a cookie and is never dereferenced.
   JavaScriptAppModalDialog::ExtraDataMap javascript_dialog_extra_data_;
 
   scoped_ptr<JavaScriptDialogExtensionsClient> extensions_client_;
   scoped_ptr<JavaScriptNativeDialogFactory> native_dialog_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManagerImpl);
 };
 
+#endif  // COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_IMPL_H_