| Index: extensions/browser/guest_view/web_view/web_view_guest.h
|
| diff --git a/chrome/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h
|
| similarity index 94%
|
| rename from chrome/browser/guest_view/web_view/web_view_guest.h
|
| rename to extensions/browser/guest_view/web_view/web_view_guest.h
|
| index ba0613f35483fdd266477d66f5b56857bd1c30f0..2e08ee3e76f5b382216068193d6fd18f72bae7dc 100644
|
| --- a/chrome/browser/guest_view/web_view/web_view_guest.h
|
| +++ b/extensions/browser/guest_view/web_view/web_view_guest.h
|
| @@ -2,23 +2,25 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
| -#define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
| +#ifndef EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
| +#define EXTENSIONS_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_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"
|
| -#include "third_party/WebKit/public/web/WebFindOptions.h"
|
| +
|
| +namespace blink {
|
| +struct WebFindOptions;
|
| +} // nanespace blink
|
|
|
| namespace extensions {
|
|
|
| @@ -165,7 +167,7 @@ class WebViewGuest : public GuestView<WebViewGuest>,
|
| void Find(
|
| const base::string16& search_text,
|
| const blink::WebFindOptions& options,
|
| - scoped_refptr<WebViewInternalFindFunction> find_function);
|
| + WebViewInternalFindFunction* find_function);
|
|
|
| // Conclude a find request to clear highlighting.
|
| void StopFinding(content::StopFindAction);
|
| @@ -323,9 +325,6 @@ class WebViewGuest : public GuestView<WebViewGuest>,
|
| // Stores the window name of the main frame of the guest.
|
| std::string name_;
|
|
|
| - // Handles find requests and replies for the webview find API.
|
| - WebViewFindHelper find_helper_;
|
| -
|
| // Handles the JavaScript dialog requests.
|
| JavaScriptDialogHelper javascript_dialog_helper_;
|
|
|
| @@ -334,9 +333,6 @@ class WebViewGuest : public GuestView<WebViewGuest>,
|
|
|
| scoped_ptr<WebViewGuestDelegate> web_view_guest_delegate_;
|
|
|
| - friend void WebViewFindHelper::DispatchFindUpdateEvent(bool canceled,
|
| - bool final_update);
|
| -
|
| // Tracks the name, and target URL of the new window. Once the first
|
| // navigation commits, we no longer track this information.
|
| struct NewWindowInfo {
|
| @@ -357,4 +353,4 @@ class WebViewGuest : public GuestView<WebViewGuest>,
|
|
|
| } // namespace extensions
|
|
|
| -#endif // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
| +#endif // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
|
|
|