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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/login_container.html ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 21 matching lines...) Expand all
32 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" 32 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
33 #include "chrome/browser/ui/shell_dialogs.h" 33 #include "chrome/browser/ui/shell_dialogs.h"
34 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" 34 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
35 #include "chrome/browser/ui/toolbar/toolbar_model.h" 35 #include "chrome/browser/ui/toolbar/toolbar_model.h"
36 #include "chrome/common/extensions/extension_constants.h" 36 #include "chrome/common/extensions/extension_constants.h"
37 #include "chrome/common/notification_registrar.h" 37 #include "chrome/common/notification_registrar.h"
38 #include "chrome/common/page_transition_types.h" 38 #include "chrome/common/page_transition_types.h"
39 #include "chrome/common/page_zoom.h" 39 #include "chrome/common/page_zoom.h"
40 #include "ui/gfx/rect.h" 40 #include "ui/gfx/rect.h"
41 41
42
42 class BrowserWindow; 43 class BrowserWindow;
43 class Extension; 44 class Extension;
44 class FindBarController; 45 class FindBarController;
45 class InstantController; 46 class InstantController;
46 class InstantUnloadHandler; 47 class InstantUnloadHandler;
47 class PrefService; 48 class PrefService;
48 class Profile; 49 class Profile;
49 class SessionStorageNamespace; 50 class SessionStorageNamespace;
50 class SkBitmap; 51 class SkBitmap;
51 class StatusBubble; 52 class StatusBubble;
52 class TabNavigation; 53 class TabNavigation;
53 class TabStripModel; 54 class TabStripModel;
54 struct WebApplicationInfo; 55 struct WebApplicationInfo;
55 namespace gfx { 56 namespace gfx {
56 class Point; 57 class Point;
57 } 58 }
58 59
60 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
61 namespace chromeos {
62 class DOMBrowser;
63 }
64 #endif
65
59 class Browser : public TabHandlerDelegate, 66 class Browser : public TabHandlerDelegate,
60 public TabContentsDelegate, 67 public TabContentsDelegate,
61 public TabContentsWrapperDelegate, 68 public TabContentsWrapperDelegate,
62 public SearchEngineTabHelperDelegate, 69 public SearchEngineTabHelperDelegate,
63 public PageNavigator, 70 public PageNavigator,
64 public CommandUpdater::CommandUpdaterDelegate, 71 public CommandUpdater::CommandUpdaterDelegate,
65 public NotificationObserver, 72 public NotificationObserver,
66 public SelectFileDialog::Listener, 73 public SelectFileDialog::Listener,
67 public TabRestoreServiceObserver, 74 public TabRestoreServiceObserver,
68 public ProfileSyncServiceObserver, 75 public ProfileSyncServiceObserver,
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 private: 729 private:
723 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); 730 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
724 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); 731 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut);
725 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); 732 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp);
726 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); 733 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
727 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref); 734 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref);
728 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref); 735 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref);
729 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref); 736 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref);
730 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutPanel); 737 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutPanel);
731 738
739 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
740 friend class chromeos::DOMBrowser;
741 #endif
742
732 // Used to describe why a tab is being detached. This is used by 743 // Used to describe why a tab is being detached. This is used by
733 // TabDetachedAtImpl. 744 // TabDetachedAtImpl.
734 enum DetachType { 745 enum DetachType {
735 // Result of TabDetachedAt. 746 // Result of TabDetachedAt.
736 DETACH_TYPE_DETACH, 747 DETACH_TYPE_DETACH,
737 748
738 // Result of TabReplacedAt. 749 // Result of TabReplacedAt.
739 DETACH_TYPE_REPLACE, 750 DETACH_TYPE_REPLACE,
740 751
741 // Result of the tab strip not having any significant tabs. 752 // Result of the tab strip not having any significant tabs.
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
1138 // and we install ourselves as an observer. 1149 // and we install ourselves as an observer.
1139 TabRestoreService* tab_restore_service_; 1150 TabRestoreService* tab_restore_service_;
1140 1151
1141 scoped_ptr<InstantController> instant_; 1152 scoped_ptr<InstantController> instant_;
1142 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1153 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1143 1154
1144 DISALLOW_COPY_AND_ASSIGN(Browser); 1155 DISALLOW_COPY_AND_ASSIGN(Browser);
1145 }; 1156 };
1146 1157
1147 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1158 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« 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