Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: chrome/browser/ui/browser.h

Issue 10825284: Make Browser aware of HostDesktopType. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rephrased a comment. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/browser.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 7a3f7dcea0dd70c2a7964327472a81c50ac06c75..2475bb2a6b001fc07f8393d4495d262e5a7951a9 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -26,6 +26,7 @@
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
#include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
@@ -158,6 +159,9 @@ class Browser : public TabStripModelObserver,
CreateParams();
explicit CreateParams(Profile* profile);
CreateParams(Type type, Profile* profile);
+ CreateParams(Type type,
+ Profile* profile,
+ chrome::HostDesktopType host_desktop_type);
static CreateParams CreateForApp(Type type,
const std::string& app_name,
@@ -172,6 +176,9 @@ class Browser : public TabStripModelObserver,
// The associated profile.
Profile* profile;
+ // The host desktop the browser is created on.
+ chrome::HostDesktopType host_desktop_type;
+
// The application name that is also the name of the window to the shell.
// This name should be set when:
// 1) we launch an application via an application shortcut or extension API.
@@ -219,6 +226,9 @@ class Browser : public TabStripModelObserver,
bool is_session_restore() const {
return is_session_restore_;
}
+ chrome::HostDesktopType host_desktop_type() {
+ return host_desktop_type_;
+ };
// Accessors ////////////////////////////////////////////////////////////////
@@ -863,6 +873,8 @@ class Browser : public TabStripModelObserver,
// Tracks when this browser is being created by session restore.
bool is_session_restore_;
+ chrome::HostDesktopType host_desktop_type_;
+
scoped_ptr<chrome::UnloadController> unload_controller_;
// The following factory is used to close the frame at a later time.
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/browser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698