summaryrefslogtreecommitdiffstats
path: root/ios/chrome/browser/browser_state
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2016-02-16 08:37:36 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-16 16:38:30 +0000
commite292025e0d2ac8294604f3c974c5abd948d13915 (patch)
tree3167aaccdb61ebcf7c8853e5cce3d7cac34fa4d9 /ios/chrome/browser/browser_state
parent19d6a0ad83b85a77c979af17a902979b453629cf (diff)
downloadchromium_src-e292025e0d2ac8294604f3c974c5abd948d13915.zip
chromium_src-e292025e0d2ac8294604f3c974c5abd948d13915.tar.gz
chromium_src-e292025e0d2ac8294604f3c974c5abd948d13915.tar.bz2
Convert C++ files to Objective-C++ files to remove hack.
In order to remove hack using __OBJC__ to forward-declare an Objective-C class as a C++ class when the file is included from a C++ file, instead convert the clients to be Objective-C++ files. This fixes all clients of ios/web/public/web_state/web_state.h. BUG=298181 Review URL: https://codereview.chromium.org/1698213003 Cr-Commit-Position: refs/heads/master@{#375592}
Diffstat (limited to 'ios/chrome/browser/browser_state')
-rw-r--r--ios/chrome/browser/browser_state/DEPS2
-rw-r--r--ios/chrome/browser/browser_state/chrome_browser_state.mm (renamed from ios/chrome/browser/browser_state/chrome_browser_state.cc)0
2 files changed, 1 insertions, 1 deletions
diff --git a/ios/chrome/browser/browser_state/DEPS b/ios/chrome/browser/browser_state/DEPS
index 696db98..cebf8ff 100644
--- a/ios/chrome/browser/browser_state/DEPS
+++ b/ios/chrome/browser/browser_state/DEPS
@@ -1,5 +1,5 @@
specific_include_rules = {
- "chrome_browser_state.cc": [
+ "chrome_browser_state.mm": [
# TODO(crbug.com/583685): remove once the //ios/web public API allow
# access to that class.
"+ios/web/webui/url_data_manager_ios_backend.h"
diff --git a/ios/chrome/browser/browser_state/chrome_browser_state.cc b/ios/chrome/browser/browser_state/chrome_browser_state.mm
index adb2333..adb2333 100644
--- a/ios/chrome/browser/browser_state/chrome_browser_state.cc
+++ b/ios/chrome/browser/browser_state/chrome_browser_state.mm