| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index f44f3f02a98f3cc77ca89d2ea8f9813a00f9e5b0..01d4954b59ec82e27bf2ff8cc75ed28f6c89b60b 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -157,20 +157,20 @@ class Browser : public TabStripModelObserver,
|
| };
|
|
|
| struct CreateParams {
|
| - CreateParams(Profile* profile, chrome::HostDesktopType host_desktop_type);
|
| + CreateParams(Profile* profile, ui::HostDesktopType host_desktop_type);
|
| CreateParams(Type type,
|
| Profile* profile,
|
| - chrome::HostDesktopType host_desktop_type);
|
| + ui::HostDesktopType host_desktop_type);
|
|
|
| static CreateParams CreateForApp(const std::string& app_name,
|
| bool trusted_source,
|
| const gfx::Rect& window_bounds,
|
| Profile* profile,
|
| - chrome::HostDesktopType host_desktop_type);
|
| + ui::HostDesktopType host_desktop_type);
|
|
|
| static CreateParams CreateForDevTools(
|
| Profile* profile,
|
| - chrome::HostDesktopType host_desktop_type);
|
| + ui::HostDesktopType host_desktop_type);
|
|
|
| // The browser type.
|
| Type type;
|
| @@ -179,7 +179,7 @@ class Browser : public TabStripModelObserver,
|
| Profile* profile;
|
|
|
| // The host desktop the browser is created on.
|
| - chrome::HostDesktopType host_desktop_type;
|
| + ui::HostDesktopType host_desktop_type;
|
|
|
| // Specifies the browser is_trusted_source_ value.
|
| bool trusted_source;
|
| @@ -233,9 +233,7 @@ class Browser : public TabStripModelObserver,
|
| bool is_session_restore() const {
|
| return is_session_restore_;
|
| }
|
| - chrome::HostDesktopType host_desktop_type() const {
|
| - return host_desktop_type_;
|
| - }
|
| + ui::HostDesktopType host_desktop_type() const { return host_desktop_type_; }
|
|
|
| // Accessors ////////////////////////////////////////////////////////////////
|
|
|
| @@ -928,7 +926,7 @@ class Browser : public TabStripModelObserver,
|
| // Tracks when this browser is being created by session restore.
|
| bool is_session_restore_;
|
|
|
| - const chrome::HostDesktopType host_desktop_type_;
|
| + const ui::HostDesktopType host_desktop_type_;
|
|
|
| scoped_ptr<chrome::UnloadController> unload_controller_;
|
| scoped_ptr<chrome::FastUnloadController> fast_unload_controller_;
|
|
|