Commit 157ac591 authored by Kurt Horimoto's avatar Kurt Horimoto Committed by Commit Bot

[iOS] Create public directory for OverlayManager public interface.

This is done to clearly separate the public interface of OverlayManager
from its internal implementation files.  Setting the "public" gn
variable for the target ensures that files that depend on overlays are
only allowed to include those files.

Bug: 941745
Change-Id: Ie9f905a857bd268c535804b3243321b6721d7c2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1562719
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: default avatarMike Dougherty <michaeldo@chromium.org>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653409}
parent c1179f2c
......@@ -4,13 +4,13 @@
source_set("overlays") {
public = [
"overlay_manager.h",
"overlay_manager_observer.h",
"overlay_modality.h",
"overlay_request.h",
"overlay_request_queue.h",
"overlay_response.h",
"overlay_user_data.h",
"public/overlay_manager.h",
"public/overlay_manager_observer.h",
"public/overlay_modality.h",
"public/overlay_request.h",
"public/overlay_request_queue.h",
"public/overlay_response.h",
"public/overlay_user_data.h",
]
sources = [
"overlay_manager_impl.h",
......
......@@ -9,8 +9,8 @@
#include <memory>
#include "base/observer_list.h"
#include "ios/chrome/browser/overlays/overlay_manager.h"
#include "ios/chrome/browser/overlays/overlay_user_data.h"
#include "ios/chrome/browser/overlays/public/overlay_manager.h"
#include "ios/chrome/browser/overlays/public/overlay_user_data.h"
class WebStateList;
......
......@@ -7,8 +7,8 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#import "ios/chrome/browser/main/browser.h"
#include "ios/chrome/browser/overlays/overlay_request.h"
#import "ios/chrome/browser/overlays/overlay_request_queue_impl.h"
#include "ios/chrome/browser/overlays/public/overlay_request.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
......
......@@ -4,8 +4,8 @@
#import "ios/chrome/browser/overlays/overlay_manager_impl.h"
#include "ios/chrome/browser/overlays/overlay_request.h"
#include "ios/chrome/browser/overlays/overlay_request_queue.h"
#include "ios/chrome/browser/overlays/public/overlay_request.h"
#include "ios/chrome/browser/overlays/public/overlay_request_queue.h"
#include "ios/chrome/browser/overlays/test/fake_overlay_user_data.h"
#import "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h"
#import "ios/chrome/browser/web_state_list/web_state_list.h"
......
......@@ -4,7 +4,7 @@
#include "ios/chrome/browser/overlays/overlay_request_impl.h"
#include "ios/chrome/browser/overlays/overlay_response.h"
#include "ios/chrome/browser/overlays/public/overlay_response.h"
// static
std::unique_ptr<OverlayRequest> OverlayRequest::Create() {
......
......@@ -7,7 +7,7 @@
#include <memory>
#include "ios/chrome/browser/overlays/overlay_request.h"
#include "ios/chrome/browser/overlays/public/overlay_request.h"
// Internal implementation of OverlayRequest.
class OverlayRequestImpl : public OverlayRequest,
......
......@@ -10,9 +10,9 @@
#include "base/containers/circular_deque.h"
#include "base/observer_list.h"
#include "ios/chrome/browser/overlays/overlay_modality.h"
#import "ios/chrome/browser/overlays/overlay_request_queue.h"
#include "ios/chrome/browser/overlays/overlay_request_queue_impl_observer.h"
#include "ios/chrome/browser/overlays/public/overlay_modality.h"
#import "ios/chrome/browser/overlays/public/overlay_request_queue.h"
#import "ios/web/public/web_state/web_state_user_data.h"
// Mutable implementation of OverlayRequestQueue.
......
......@@ -7,7 +7,7 @@
#include <utility>
#include "base/memory/ptr_util.h"
#include "ios/chrome/browser/overlays/overlay_request.h"
#include "ios/chrome/browser/overlays/public/overlay_request.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
......
......@@ -4,8 +4,8 @@
#import "ios/chrome/browser/overlays/overlay_request_queue_impl.h"
#include "ios/chrome/browser/overlays/overlay_request.h"
#include "ios/chrome/browser/overlays/overlay_request_queue_impl_observer.h"
#include "ios/chrome/browser/overlays/public/overlay_request.h"
#include "ios/chrome/browser/overlays/test/fake_overlay_user_data.h"
#import "ios/web/public/test/fakes/test_web_state.h"
#include "testing/gmock/include/gmock/gmock.h"
......
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ios/chrome/browser/overlays/overlay_request.h"
#include "ios/chrome/browser/overlays/public/overlay_request.h"
#include "ios/chrome/browser/overlays/test/fake_overlay_user_data.h"
#include "testing/platform_test.h"
......
......@@ -5,7 +5,7 @@
#ifndef IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_RESPONSE_IMPL_H_
#define IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_RESPONSE_IMPL_H_
#include "ios/chrome/browser/overlays/overlay_response.h"
#include "ios/chrome/browser/overlays/public/overlay_response.h"
// Internal implementation of OverlayResponse.
class OverlayResponseImpl : public OverlayResponse,
......
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ios/chrome/browser/overlays/overlay_response.h"
#include "ios/chrome/browser/overlays/public/overlay_response.h"
#include "ios/chrome/browser/overlays/test/fake_overlay_user_data.h"
#include "testing/platform_test.h"
......
......@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_MANAGER_H_
#define IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_MANAGER_H_
#ifndef IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_MANAGER_H_
#define IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_MANAGER_H_
#include <memory>
#include "ios/chrome/browser/overlays/overlay_modality.h"
#include "ios/chrome/browser/overlays/public/overlay_modality.h"
class Browser;
class OverlayRequest;
......@@ -43,4 +43,4 @@ class OverlayManager {
web::WebState* web_state) = 0;
};
#endif // IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_MANAGER_H_
#endif // IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_MANAGER_H_
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_MANAGER_OBSERVER_H_
#define IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_MANAGER_OBSERVER_H_
#ifndef IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_MANAGER_OBSERVER_H_
#define IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_MANAGER_OBSERVER_H_
class OverlayManager;
class OverlayRequest;
......@@ -36,4 +36,4 @@ class OverlayManagerObserver {
virtual void OverlayManagerDestroyed(OverlayManager* manager) {}
};
#endif // IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_MANAGER_OBSERVER_H_
#endif // IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_MANAGER_OBSERVER_H_
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_MODALITY_H_
#define IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_MODALITY_H_
#ifndef IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_MODALITY_H_
#define IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_MODALITY_H_
// An OverlayManager instance manages overlays for a single Browser at a single
// level of modality. Additional values should be added for each desired level
......@@ -14,4 +14,4 @@ enum class OverlayModality {
kWebContentArea,
};
#endif // IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_MODALITY_H_
#endif // IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_MODALITY_H_
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_REQUEST_H_
#define IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_REQUEST_H_
#ifndef IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_REQUEST_H_
#define IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_REQUEST_H_
#include <memory>
......@@ -56,4 +56,4 @@ class OverlayRequest {
virtual base::SupportsUserData* data() = 0;
};
#endif // IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_REQUEST_H_
#endif // IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_REQUEST_H_
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_REQUEST_QUEUE_H_
#define IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_REQUEST_QUEUE_H_
#ifndef IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_REQUEST_QUEUE_H_
#define IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_REQUEST_QUEUE_H_
class OverlayRequest;
......@@ -24,4 +24,4 @@ class OverlayRequestQueue {
DISALLOW_COPY_AND_ASSIGN(OverlayRequestQueue);
};
#endif // IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_REQUEST_QUEUE_H_
#endif // IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_REQUEST_QUEUE_H_
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_RESPONSE_H_
#define IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_RESPONSE_H_
#ifndef IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_RESPONSE_H_
#define IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_RESPONSE_H_
#include <memory>
......@@ -47,4 +47,4 @@ class OverlayResponse {
virtual base::SupportsUserData* data() = 0;
};
#endif // IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_RESPONSE_H_
#endif // IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_RESPONSE_H_
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_USER_DATA_H_
#define IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_USER_DATA_H_
#ifndef IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_USER_DATA_H_
#define IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_USER_DATA_H_
#include "base/memory/ptr_util.h"
#include "base/supports_user_data.h"
......@@ -75,4 +75,4 @@ class OverlayUserData : public base::SupportsUserData::Data {
static const void* UserDataKey() { return &DataType::kUserDataKey; }
};
#endif // IOS_CHROME_BROWSER_OVERLAYS_OVERLAY_USER_DATA_H_
#endif // IOS_CHROME_BROWSER_OVERLAYS_PUBLIC_OVERLAY_USER_DATA_H_
......@@ -5,7 +5,7 @@
#ifndef IOS_CHROME_BROWSER_OVERLAYS_TEST_FAKE_OVERLAY_USER_DATA_H_
#define IOS_CHROME_BROWSER_OVERLAYS_TEST_FAKE_OVERLAY_USER_DATA_H_
#include "ios/chrome/browser/overlays/overlay_user_data.h"
#include "ios/chrome/browser/overlays/public/overlay_user_data.h"
// Test OverlayUserData that can be used to store arbitrary pointers in
// OverlayRequests and OverlayResponses.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment