| Index: chrome/browser/guest_view/web_view/web_view_guest.h
|
| diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/chrome/browser/guest_view/web_view/web_view_guest.h
|
| similarity index 96%
|
| rename from extensions/browser/guest_view/web_view/web_view_guest.h
|
| rename to chrome/browser/guest_view/web_view/web_view_guest.h
|
| index a6a9206706c6e0680827b291c60b4a1145a1f49e..ba0613f35483fdd266477d66f5b56857bd1c30f0 100644
|
| --- a/extensions/browser/guest_view/web_view/web_view_guest.h
|
| +++ b/chrome/browser/guest_view/web_view/web_view_guest.h
|
| @@ -2,26 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
| -#define EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
| +#ifndef CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
| +#define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
|
|
| #include <vector>
|
|
|
| #include "base/observer_list.h"
|
| +#include "chrome/browser/guest_view/web_view/javascript_dialog_helper.h"
|
| +#include "chrome/browser/guest_view/web_view/web_view_find_helper.h"
|
| +#include "chrome/browser/guest_view/web_view/web_view_permission_helper.h"
|
| +#include "chrome/browser/guest_view/web_view/web_view_permission_types.h"
|
| #include "content/public/browser/javascript_dialog_manager.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "extensions/browser/guest_view/guest_view.h"
|
| -#include "extensions/browser/guest_view/web_view/javascript_dialog_helper.h"
|
| -#include "extensions/browser/guest_view/web_view/web_view_find_helper.h"
|
| #include "extensions/browser/guest_view/web_view/web_view_guest_delegate.h"
|
| -#include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
|
| -#include "extensions/browser/guest_view/web_view/web_view_permission_types.h"
|
| #include "extensions/browser/script_executor.h"
|
| -
|
| -namespace blink {
|
| -struct WebFindOptions;
|
| -} // nanespace blink
|
| +#include "third_party/WebKit/public/web/WebFindOptions.h"
|
|
|
| namespace extensions {
|
|
|
| @@ -360,4 +357,4 @@ class WebViewGuest : public GuestView<WebViewGuest>,
|
|
|
| } // namespace extensions
|
|
|
| -#endif // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
| +#endif // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
|
|