Chromium Code Reviews| Index: chrome/browser/guest_view/web_view/web_view_guest.h |
| diff --git a/chrome/browser/guest_view/web_view/web_view_guest.h b/chrome/browser/guest_view/web_view/web_view_guest.h |
| index 1ddda0c6c5a2b2bfdfad2d79ec7764d87abeeb0d..a307b26eb635850df38b87d2251fab44257f27f0 100644 |
| --- a/chrome/browser/guest_view/web_view/web_view_guest.h |
| +++ b/chrome/browser/guest_view/web_view/web_view_guest.h |
| @@ -23,8 +23,6 @@ |
| #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
| #endif |
| -namespace webview_api = extensions::api::web_view_internal; |
| - |
| class RenderViewContextMenu; |
| namespace ui { |
| @@ -32,6 +30,9 @@ class SimpleMenuModel; |
| } // namespace ui |
| namespace extensions { |
| + |
| +namespace webview_api = api::web_view_internal; |
| + |
| class ScriptExecutor; |
| class WebViewInternalFindFunction; |
| @@ -175,7 +176,7 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
| void Find( |
| const base::string16& search_text, |
| const blink::WebFindOptions& options, |
| - scoped_refptr<extensions::WebViewInternalFindFunction> find_function); |
| + scoped_refptr<WebViewInternalFindFunction> find_function); |
| // Conclude a find request to clear highlighting. |
| void StopFinding(content::StopFindAction); |
| @@ -233,7 +234,7 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
| uint32 removal_mask, |
| const base::Closure& callback); |
| - extensions::ScriptExecutor* script_executor() { |
| + ScriptExecutor* script_executor() { |
| return script_executor_.get(); |
| } |
| @@ -336,9 +337,9 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
| void SetUpAutoSize(); |
| - ObserverList<extensions::TabHelper::ScriptExecutionObserver> |
| + ObserverList<TabHelper::ScriptExecutionObserver> |
| script_observers_; |
|
Fady Samuel
2014/08/12 21:25:30
Move to previous line?
Xi Han
2014/08/12 21:53:48
Done.
|
| - scoped_ptr<extensions::ScriptExecutor> script_executor_; |
| + scoped_ptr<ScriptExecutor> script_executor_; |
| content::NotificationRegistrar notification_registrar_; |