Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: components/guest_view/browser/guest_view_base.h

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed John's comments Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/guest_view/browser/guest_view.h ('k') | components/guest_view/browser/guest_view_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/guest_view/browser/guest_view_base.h
diff --git a/extensions/browser/guest_view/guest_view_base.h b/components/guest_view/browser/guest_view_base.h
similarity index 98%
rename from extensions/browser/guest_view/guest_view_base.h
rename to components/guest_view/browser/guest_view_base.h
index 450654515420577af7424f212ea639ab5b911edc..74fb59c5ea593f06c12b0079bef8ce8d0dcaee6b 100644
--- a/extensions/browser/guest_view/guest_view_base.h
+++ b/components/guest_view/browser/guest_view_base.h
@@ -2,13 +2,14 @@
// 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_GUEST_VIEW_BASE_H_
-#define EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
+#ifndef COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_BASE_H_
+#define COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_BASE_H_
#include <queue>
#include "base/memory/weak_ptr.h"
#include "base/values.h"
+#include "components/guest_view/common/guest_view_constants.h"
#include "components/ui/zoom/zoom_observer.h"
#include "content/public/browser/browser_plugin_guest_delegate.h"
#include "content/public/browser/guest_host.h"
@@ -16,11 +17,10 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_contents_observer.h"
-#include "extensions/common/guest_view/guest_view_constants.h"
struct RendererContentSettingRules;
-namespace extensions {
+namespace guest_view {
class GuestViewEvent;
@@ -229,7 +229,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
// Returns whether this guest has an associated embedder.
bool attached() const {
- return element_instance_id_ != guestview::kInstanceIDNone;
+ return element_instance_id_ != kInstanceIDNone;
}
// Returns the instance ID of the <*view> element.
@@ -453,6 +453,6 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
DISALLOW_COPY_AND_ASSIGN(GuestViewBase);
};
-} // namespace extensions
+} // namespace guest_view
-#endif // EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
+#endif // COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_BASE_H_
« no previous file with comments | « components/guest_view/browser/guest_view.h ('k') | components/guest_view/browser/guest_view_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698