summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tabs
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/tabs')
-rw-r--r--chrome/browser/tabs/pinned_tab_codec.cc2
-rw-r--r--chrome/browser/tabs/pinned_tab_codec.h4
-rw-r--r--chrome/browser/tabs/pinned_tab_test_utils.cc4
-rw-r--r--chrome/browser/tabs/pinned_tab_test_utils.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/tabs/pinned_tab_codec.cc b/chrome/browser/tabs/pinned_tab_codec.cc
index eb09cd1..d50d1f0 100644
--- a/chrome/browser/tabs/pinned_tab_codec.cc
+++ b/chrome/browser/tabs/pinned_tab_codec.cc
@@ -20,7 +20,7 @@
using content::NavigationEntry;
-typedef BrowserInit::LaunchWithProfile::Tab Tab;
+typedef StartupBrowserCreator::LaunchWithProfile::Tab Tab;
// Key used in dictionaries for the app id.
static const char kAppID[] = "app_id";
diff --git a/chrome/browser/tabs/pinned_tab_codec.h b/chrome/browser/tabs/pinned_tab_codec.h
index 28542dc..2872f90 100644
--- a/chrome/browser/tabs/pinned_tab_codec.h
+++ b/chrome/browser/tabs/pinned_tab_codec.h
@@ -8,7 +8,7 @@
#include <vector>
-#include "chrome/browser/ui/browser_init.h"
+#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "googleurl/src/gurl.h"
namespace base {
@@ -27,7 +27,7 @@ class Profile;
// dictionary describing the entry.
class PinnedTabCodec {
public:
- typedef std::vector<BrowserInit::LaunchWithProfile::Tab> Tabs;
+ typedef std::vector<StartupBrowserCreator::LaunchWithProfile::Tab> Tabs;
// Registers the preference used by this class.
static void RegisterUserPrefs(PrefService* prefs);
diff --git a/chrome/browser/tabs/pinned_tab_test_utils.cc b/chrome/browser/tabs/pinned_tab_test_utils.cc
index 087df64..0360a02 100644
--- a/chrome/browser/tabs/pinned_tab_test_utils.cc
+++ b/chrome/browser/tabs/pinned_tab_test_utils.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/tabs/pinned_tab_test_utils.h"
-typedef BrowserInit::LaunchWithProfile::Tab Tab;
+typedef StartupBrowserCreator::LaunchWithProfile::Tab Tab;
namespace {
@@ -17,7 +17,7 @@ std::string TabToString(const Tab& tab) {
// static
std::string PinnedTabTestUtils::TabsToString(
- const std::vector<BrowserInit::LaunchWithProfile::Tab>& values) {
+ const std::vector<StartupBrowserCreator::LaunchWithProfile::Tab>& values) {
std::string result;
for (size_t i = 0; i < values.size(); ++i) {
if (i != 0)
diff --git a/chrome/browser/tabs/pinned_tab_test_utils.h b/chrome/browser/tabs/pinned_tab_test_utils.h
index ab73e34..57850de 100644
--- a/chrome/browser/tabs/pinned_tab_test_utils.h
+++ b/chrome/browser/tabs/pinned_tab_test_utils.h
@@ -10,7 +10,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "chrome/browser/ui/browser_init.h"
+#include "chrome/browser/ui/startup/startup_browser_creator.h"
class PinnedTabTestUtils {
public:
@@ -18,7 +18,7 @@ class PinnedTabTestUtils {
// of urls. If the tab is an app, ':app' is appended, and if the tab is
// pinned, ':pinned' is appended.
static std::string TabsToString(
- const std::vector<BrowserInit::LaunchWithProfile::Tab>& values);
+ const std::vector<StartupBrowserCreator::LaunchWithProfile::Tab>& values);
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(PinnedTabTestUtils);