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

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

Issue 6577003: Entire DOMBrowser stack (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 10 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 | « chrome/browser/resources/login_container.html ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
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 b03b39ba4d333b976e9cdd85989b3d08a830b237..45d218770a9d9b24cff96b4df5f8dba562d8f1f8 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -39,6 +39,7 @@
#include "chrome/common/page_zoom.h"
#include "ui/gfx/rect.h"
+
class BrowserWindow;
class Extension;
class FindBarController;
@@ -56,6 +57,12 @@ namespace gfx {
class Point;
}
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+namespace chromeos {
+class DOMBrowser;
+}
+#endif
+
class Browser : public TabHandlerDelegate,
public TabContentsDelegate,
public TabContentsWrapperDelegate,
@@ -729,6 +736,10 @@ class Browser : public TabHandlerDelegate,
FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref);
FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutPanel);
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+ friend class chromeos::DOMBrowser;
+#endif
+
// Used to describe why a tab is being detached. This is used by
// TabDetachedAtImpl.
enum DetachType {
« no previous file with comments | « chrome/browser/resources/login_container.html ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698