Skip to content

GitLab

T
tangled
Commit 96efe634 authored by Kurt Horimoto's avatar Kurt Horimoto Committed by Commit Bot
Browse files
Options

[iOS] Create separate directory for infobar overlay classes. 

TBR=rohitrao@chromium.org

Bug: none
Change-Id: I547ed0d1a48fc2a330b570242b098d37969b3d84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1955601
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Auto-Submit: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723399}
parent c0e91a03
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 51 deletions
ios/chrome/browser/infobars/BUILD.gn
View file @ 96efe634
...@@ -34,28 +34,6 @@ source_set("infobars") { ...@@ -34,28 +34,6 @@ source_set("infobars") {
] ]
} }
source_set("overlays") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
"infobar_banner_overlay_request_factory.h",
"infobar_banner_overlay_request_factory_impl.h",
"infobar_banner_overlay_request_factory_impl.mm",
"infobar_overlay_request_cancel_handler.h",
"infobar_overlay_request_cancel_handler.mm",
"infobar_overlay_tab_helper.h",
"infobar_overlay_tab_helper.mm",
]
deps = [
":infobars",
"//base",
"//components/infobars/core",
"//ios/chrome/browser/overlays",
"//ios/chrome/browser/overlays/public/infobar_banner",
"//ios/chrome/browser/passwords:infobar_delegates",
"//ios/web/public",
]
}
source_set("badge_public") { source_set("badge_public") {
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
sources = [ sources = [
...@@ -107,18 +85,13 @@ source_set("unit_tests") { ...@@ -107,18 +85,13 @@ source_set("unit_tests") {
testonly = true testonly = true
sources = [ sources = [
"infobar_badge_tab_helper_unittest.mm", "infobar_badge_tab_helper_unittest.mm",
"infobar_overlay_request_cancel_handler_unittest.mm",
"infobar_overlay_tab_helper_unittest.mm",
] ]
deps = [ deps = [
":badge", ":badge",
":infobars", ":infobars",
":overlays",
"//base/test:test_support", "//base/test:test_support",
"//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/infobars:public", "//ios/chrome/browser/infobars:public",
"//ios/chrome/browser/overlays",
"//ios/chrome/browser/overlays/test",
"//ios/chrome/browser/ui/badges:public", "//ios/chrome/browser/ui/badges:public",
"//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/infobars:feature_flags",
"//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/ui/infobars:infobars_ui",
......
ios/chrome/browser/infobars/overlays/BUILD.gn 0 → 100644
View file @ 96efe634
# Copyright 2019 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
source_set("overlays") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
"infobar_banner_overlay_request_factory.h",
"infobar_banner_overlay_request_factory_impl.h",
"infobar_banner_overlay_request_factory_impl.mm",
"infobar_overlay_request_cancel_handler.h",
"infobar_overlay_request_cancel_handler.mm",
"infobar_overlay_tab_helper.h",
"infobar_overlay_tab_helper.mm",
]
deps = [
"//base",
"//components/infobars/core",
"//ios/chrome/browser/infobars",
"//ios/chrome/browser/overlays",
"//ios/chrome/browser/overlays/public/infobar_banner",
"//ios/chrome/browser/passwords:infobar_delegates",
"//ios/web/public",
]
}
source_set("unit_tests") {
configs += [ "//build/config/compiler:enable_arc" ]
testonly = true
sources = [
"infobar_overlay_request_cancel_handler_unittest.mm",
"infobar_overlay_tab_helper_unittest.mm",
]
deps = [
":overlays",
"//base/test:test_support",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/infobars",
"//ios/chrome/browser/infobars:public",
"//ios/chrome/browser/overlays",
"//ios/chrome/browser/overlays/test",
"//ios/chrome/browser/ui/infobars:test_support",
"//ios/chrome/browser/ui/infobars/test",
"//ios/chrome/test:test_support",
"//ios/web/public/test/fakes",
"//testing/gtest",
]
}
ios/chrome/browser/infobars/infobar_banner_overlay_request_factory.h → ios/chrome/browser/infobars/overlays/infobar_banner_overlay_request_factory.h
View file @ 96efe634
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_INFOBARS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_H_ #ifndef IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_H_
#define IOS_CHROME_BROWSER_INFOBARS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_H_ #define IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_H_
#include <memory> #include <memory>
...@@ -23,4 +23,4 @@ class InfobarBannerOverlayRequestFactory { ...@@ -23,4 +23,4 @@ class InfobarBannerOverlayRequestFactory {
infobars::InfoBar* infobar) = 0; infobars::InfoBar* infobar) = 0;
}; };
#endif // IOS_CHROME_BROWSER_INFOBARS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_H_ #endif // IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_H_
ios/chrome/browser/infobars/infobar_banner_overlay_request_factory_impl.h → ios/chrome/browser/infobars/overlays/infobar_banner_overlay_request_factory_impl.h
View file @ 96efe634
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_INFOBARS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_IMPL_H_ #ifndef IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_IMPL_H_
#define IOS_CHROME_BROWSER_INFOBARS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_IMPL_H_ #define IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_IMPL_H_
#import "ios/chrome/browser/infobars/infobar_banner_overlay_request_factory.h" #import "ios/chrome/browser/infobars/overlays/infobar_banner_overlay_request_factory.h"
// Implementation of InfobarBannerOverlayRequestFactory. // Implementation of InfobarBannerOverlayRequestFactory.
class InfobarBannerOverlayRequestFactoryImpl class InfobarBannerOverlayRequestFactoryImpl
...@@ -20,4 +20,4 @@ class InfobarBannerOverlayRequestFactoryImpl ...@@ -20,4 +20,4 @@ class InfobarBannerOverlayRequestFactoryImpl
infobars::InfoBar* infobar) override; infobars::InfoBar* infobar) override;
}; };
#endif // IOS_CHROME_BROWSER_INFOBARS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_IMPL_H_ #endif // IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_BANNER_OVERLAY_REQUEST_FACTORY_IMPL_H_
ios/chrome/browser/infobars/infobar_banner_overlay_request_factory_impl.mm → ios/chrome/browser/infobars/overlays/infobar_banner_overlay_request_factory_impl.mm
View file @ 96efe634
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import "ios/chrome/browser/infobars/infobar_banner_overlay_request_factory_impl.h" #import "ios/chrome/browser/infobars/overlays/infobar_banner_overlay_request_factory_impl.h"
#include "components/infobars/core/infobar.h" #include "components/infobars/core/infobar.h"
#include "components/infobars/core/infobar_delegate.h" #include "components/infobars/core/infobar_delegate.h"
......
ios/chrome/browser/infobars/infobar_overlay_request_cancel_handler.h → ios/chrome/browser/infobars/overlays/infobar_overlay_request_cancel_handler.h
View file @ 96efe634
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_INFOBARS_INFOBAR_OVERLAY_REQUEST_CANCEL_HANDLER_H_ #ifndef IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_OVERLAY_REQUEST_CANCEL_HANDLER_H_
#define IOS_CHROME_BROWSER_INFOBARS_INFOBAR_OVERLAY_REQUEST_CANCEL_HANDLER_H_ #define IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_OVERLAY_REQUEST_CANCEL_HANDLER_H_
#include "base/scoped_observer.h" #include "base/scoped_observer.h"
#include "components/infobars/core/infobar_manager.h" #include "components/infobars/core/infobar_manager.h"
...@@ -45,4 +45,4 @@ class InfobarOverlayRequestCancelHandler : public OverlayRequestCancelHandler { ...@@ -45,4 +45,4 @@ class InfobarOverlayRequestCancelHandler : public OverlayRequestCancelHandler {
RemovalObserver removal_observer_; RemovalObserver removal_observer_;
}; };
#endif // IOS_CHROME_BROWSER_INFOBARS_INFOBAR_OVERLAY_REQUEST_CANCEL_HANDLER_H_ #endif // IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_OVERLAY_REQUEST_CANCEL_HANDLER_H_
ios/chrome/browser/infobars/infobar_overlay_request_cancel_handler.mm → ios/chrome/browser/infobars/overlays/infobar_overlay_request_cancel_handler.mm
View file @ 96efe634
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import "ios/chrome/browser/infobars/infobar_overlay_request_cancel_handler.h" #import "ios/chrome/browser/infobars/overlays/infobar_overlay_request_cancel_handler.h"
#include "base/logging.h" #include "base/logging.h"
#include "components/infobars/core/infobar.h" #include "components/infobars/core/infobar.h"
......
ios/chrome/browser/infobars/infobar_overlay_request_cancel_handler_unittest.mm → ios/chrome/browser/infobars/overlays/infobar_overlay_request_cancel_handler_unittest.mm
View file @ 96efe634
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import "ios/chrome/browser/infobars/infobar_overlay_request_cancel_handler.h" #import "ios/chrome/browser/infobars/overlays/infobar_overlay_request_cancel_handler.h"
#include "components/infobars/core/infobar.h" #include "components/infobars/core/infobar.h"
#include "ios/chrome/browser/infobars/infobar_manager_impl.h" #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
......
ios/chrome/browser/infobars/infobar_overlay_tab_helper.h → ios/chrome/browser/infobars/overlays/infobar_overlay_tab_helper.h
View file @ 96efe634
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_INFOBARS_INFOBAR_OVERLAY_TAB_HELPER_H_ #ifndef IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_OVERLAY_TAB_HELPER_H_
#define IOS_CHROME_BROWSER_INFOBARS_INFOBAR_OVERLAY_TAB_HELPER_H_ #define IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_OVERLAY_TAB_HELPER_H_
#include <memory> #include <memory>
...@@ -64,4 +64,4 @@ class InfobarOverlayTabHelper ...@@ -64,4 +64,4 @@ class InfobarOverlayTabHelper
// corresponding WebState's InfoBarManagerImpl. // corresponding WebState's InfoBarManagerImpl.
OverlayRequestScheduler overlay_request_scheduler_; OverlayRequestScheduler overlay_request_scheduler_;
}; };
#endif // IOS_CHROME_BROWSER_INFOBARS_INFOBAR_OVERLAY_TAB_HELPER_H_ #endif // IOS_CHROME_BROWSER_INFOBARS_OVERLAYS_INFOBAR_OVERLAY_TAB_HELPER_H_
ios/chrome/browser/infobars/infobar_overlay_tab_helper.mm → ios/chrome/browser/infobars/overlays/infobar_overlay_tab_helper.mm
View file @ 96efe634
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import "ios/chrome/browser/infobars/infobar_overlay_tab_helper.h" #import "ios/chrome/browser/infobars/overlays/infobar_overlay_tab_helper.h"
#include "base/logging.h" #include "base/logging.h"
#import "ios/chrome/browser/infobars/infobar_banner_overlay_request_factory.h"
#include "ios/chrome/browser/infobars/infobar_manager_impl.h" #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
#import "ios/chrome/browser/infobars/infobar_overlay_request_cancel_handler.h" #import "ios/chrome/browser/infobars/overlays/infobar_banner_overlay_request_factory.h"
#import "ios/chrome/browser/infobars/overlays/infobar_overlay_request_cancel_handler.h"
#include "ios/chrome/browser/overlays/public/overlay_request.h" #include "ios/chrome/browser/overlays/public/overlay_request.h"
#import "ios/chrome/browser/overlays/public/overlay_request_queue.h" #import "ios/chrome/browser/overlays/public/overlay_request_queue.h"
......
ios/chrome/browser/infobars/infobar_overlay_tab_helper_unittest.mm → ios/chrome/browser/infobars/overlays/infobar_overlay_tab_helper_unittest.mm
View file @ 96efe634
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#import "ios/chrome/browser/infobars/infobar_overlay_tab_helper.h" #import "ios/chrome/browser/infobars/overlays/infobar_overlay_tab_helper.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "components/infobars/core/infobar.h" #include "components/infobars/core/infobar.h"
#include "components/infobars/core/infobar_delegate.h" #include "components/infobars/core/infobar_delegate.h"
#import "ios/chrome/browser/infobars/infobar_banner_overlay_request_factory.h"
#include "ios/chrome/browser/infobars/infobar_manager_impl.h" #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
#import "ios/chrome/browser/infobars/overlays/infobar_banner_overlay_request_factory.h"
#include "ios/chrome/browser/overlays/public/overlay_request.h" #include "ios/chrome/browser/overlays/public/overlay_request.h"
#import "ios/chrome/browser/overlays/public/overlay_request_queue.h" #import "ios/chrome/browser/overlays/public/overlay_request_queue.h"
#include "ios/chrome/browser/overlays/test/fake_overlay_user_data.h" #include "ios/chrome/browser/overlays/test/fake_overlay_user_data.h"
......
ios/chrome/browser/tabs/BUILD.gn
View file @ 96efe634
...@@ -73,7 +73,7 @@ source_set("tabs_internal") { ...@@ -73,7 +73,7 @@ source_set("tabs_internal") {
"//ios/chrome/browser/history:tab_helper", "//ios/chrome/browser/history:tab_helper",
"//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars",
"//ios/chrome/browser/infobars:badge", "//ios/chrome/browser/infobars:badge",
"//ios/chrome/browser/infobars:overlays", "//ios/chrome/browser/infobars/overlays",
"//ios/chrome/browser/itunes_urls", "//ios/chrome/browser/itunes_urls",
"//ios/chrome/browser/main", "//ios/chrome/browser/main",
"//ios/chrome/browser/metrics", "//ios/chrome/browser/metrics",
......
ios/chrome/browser/tabs/tab_helper_util.mm
View file @ 96efe634
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
#include "ios/chrome/browser/history/history_tab_helper.h" #include "ios/chrome/browser/history/history_tab_helper.h"
#include "ios/chrome/browser/history/top_sites_factory.h" #include "ios/chrome/browser/history/top_sites_factory.h"
#include "ios/chrome/browser/infobars/infobar_badge_tab_helper.h" #include "ios/chrome/browser/infobars/infobar_badge_tab_helper.h"
#import "ios/chrome/browser/infobars/infobar_banner_overlay_request_factory_impl.h"
#import "ios/chrome/browser/infobars/infobar_manager_impl.h" #import "ios/chrome/browser/infobars/infobar_manager_impl.h"
#import "ios/chrome/browser/infobars/infobar_overlay_tab_helper.h" #import "ios/chrome/browser/infobars/overlays/infobar_banner_overlay_request_factory_impl.h"
#import "ios/chrome/browser/infobars/overlays/infobar_overlay_tab_helper.h"
#import "ios/chrome/browser/itunes_urls/itunes_urls_handler_tab_helper.h" #import "ios/chrome/browser/itunes_urls/itunes_urls_handler_tab_helper.h"
#import "ios/chrome/browser/network_activity/network_activity_indicator_tab_helper.h" #import "ios/chrome/browser/network_activity/network_activity_indicator_tab_helper.h"
#import "ios/chrome/browser/open_in/open_in_tab_helper.h" #import "ios/chrome/browser/open_in/open_in_tab_helper.h"
......
ios/chrome/test/BUILD.gn
View file @ 96efe634
...@@ -174,6 +174,7 @@ test("ios_chrome_unittests") { ...@@ -174,6 +174,7 @@ test("ios_chrome_unittests") {
"//ios/chrome/browser/geolocation:unit_tests", "//ios/chrome/browser/geolocation:unit_tests",
"//ios/chrome/browser/history:unit_tests", "//ios/chrome/browser/history:unit_tests",
"//ios/chrome/browser/infobars:unit_tests", "//ios/chrome/browser/infobars:unit_tests",
"//ios/chrome/browser/infobars/overlays:unit_tests",
"//ios/chrome/browser/itunes_urls:unit_tests", "//ios/chrome/browser/itunes_urls:unit_tests",
"//ios/chrome/browser/json_parser:unit_tests", "//ios/chrome/browser/json_parser:unit_tests",
"//ios/chrome/browser/language:unit_tests", "//ios/chrome/browser/language:unit_tests",
......
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