Move ExternalTabContainer into a directory with an OWNERS file.

BUG=120901
TEST=NONE

Review URL: https://chromiumcodereview.appspot.com/9959051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130508 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 14 insertions, 9 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 3dabdfd..89119a8 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -91,7 +91,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
-#include "chrome/browser/external_tab_container_win.h"
+#include "chrome/browser/external_tab/external_tab_container_win.h"
 #endif  // defined(OS_WIN)
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index 4587a4d..6d9d9c3 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_tab_tracker.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
-#include "chrome/browser/external_tab_container_win.h"
+#include "chrome/browser/external_tab/external_tab_container_win.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
diff --git a/chrome/browser/external_tab/OWNERS b/chrome/browser/external_tab/OWNERS
new file mode 100644
index 0000000..4b0068a
--- /dev/null
+++ b/chrome/browser/external_tab/OWNERS
@@ -0,0 +1,4 @@
+ananta@chromium.org
+erikwright@chromium.org
+grt@chromium.org
+robertshield@chromium.org
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab/external_tab_container_win.cc
index db366f5..d760059 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab/external_tab_container_win.cc
@@ -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 "chrome/browser/external_tab_container_win.h"
+#include "chrome/browser/external_tab/external_tab_container_win.h"
 
 #include <string>
 
@@ -12,6 +12,7 @@
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/win_util.h"
 #include "chrome/app/chrome_command_ids.h"
@@ -533,7 +534,7 @@ void ExternalTabContainer::UpdateTargetURL(WebContents* source,
                                            const GURL& url) {
   Browser::UpdateTargetURLHelper(source, page_id, url);
   if (automation_) {
-    std::wstring url_string = CA2W(url.spec().c_str());
+    string16 url_string = CA2W(url.spec().c_str());
     automation_->Send(
         new AutomationMsg_UpdateTargetUrl(tab_handle_, url_string));
   }
diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab/external_tab_container_win.h
index 7f76a28..ed6f20f 100644
--- a/chrome/browser/external_tab_container_win.h
+++ b/chrome/browser/external_tab/external_tab_container_win.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 CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
-#define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
+#ifndef CHROME_BROWSER_EXTERNAL_TAB_EXTERNAL_TAB_CONTAINER_WIN_H_
+#define CHROME_BROWSER_EXTERNAL_TAB_EXTERNAL_TAB_CONTAINER_WIN_H_
 #pragma once
 
 #include <map>
@@ -422,4 +422,4 @@ class TemporaryPopupExternalTabContainer : public ExternalTabContainer {
   }
 };
 
-#endif  // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
+#endif  // CHROME_BROWSER_EXTERNAL_TAB_EXTERNAL_TAB_CONTAINER_WIN_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e20c172..9eba62d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1048,8 +1048,8 @@
         'browser/external_protocol/external_protocol_handler.h',
         'browser/external_protocol/external_protocol_observer.cc',
         'browser/external_protocol/external_protocol_observer.h',
-        'browser/external_tab_container_win.cc',
-        'browser/external_tab_container_win.h',
+        'browser/external_tab/external_tab_container_win.cc',
+        'browser/external_tab/external_tab_container_win.h',
         'browser/favicon/favicon_handler.cc',
         'browser/favicon/favicon_handler.h',
         'browser/favicon/favicon_handler_delegate.h',