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

Side by Side Diff: chrome/browser/ui/browser.h

Issue 10735061: Move ExtensionWindowController and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest master for cq Created 8 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "content/public/common/page_transition_types.h" 42 #include "content/public/common/page_transition_types.h"
43 #include "content/public/common/page_zoom.h" 43 #include "content/public/common/page_zoom.h"
44 #include "ui/base/ui_base_types.h" 44 #include "ui/base/ui_base_types.h"
45 #include "ui/gfx/rect.h" 45 #include "ui/gfx/rect.h"
46 46
47 class BrowserContentSettingBubbleModelDelegate; 47 class BrowserContentSettingBubbleModelDelegate;
48 class BrowserSyncedWindowDelegate; 48 class BrowserSyncedWindowDelegate;
49 class BrowserToolbarModelDelegate; 49 class BrowserToolbarModelDelegate;
50 class BrowserTabRestoreServiceDelegate; 50 class BrowserTabRestoreServiceDelegate;
51 class BrowserWindow; 51 class BrowserWindow;
52 class ExtensionWindowController;
53 class FindBarController; 52 class FindBarController;
54 class FullscreenController; 53 class FullscreenController;
55 class PrefService; 54 class PrefService;
56 class Profile; 55 class Profile;
57 class SkBitmap; 56 class SkBitmap;
58 class StatusBubble; 57 class StatusBubble;
59 class TabNavigation; 58 class TabNavigation;
60 class TabStripModel; 59 class TabStripModel;
61 class TabStripModelDelegate; 60 class TabStripModelDelegate;
62 struct WebApplicationInfo; 61 struct WebApplicationInfo;
63 62
64 namespace chrome { 63 namespace chrome {
65 class BrowserCommandController; 64 class BrowserCommandController;
66 class BrowserInstantController; 65 class BrowserInstantController;
67 class UnloadController; 66 class UnloadController;
68 namespace search { 67 namespace search {
69 class SearchDelegate; 68 class SearchDelegate;
70 class SearchModel; 69 class SearchModel;
71 } 70 }
72 } 71 }
73 72
74 namespace content { 73 namespace content {
75 class NavigationController; 74 class NavigationController;
76 class SessionStorageNamespace; 75 class SessionStorageNamespace;
77 } 76 }
78 77
79 namespace extensions { 78 namespace extensions {
80 class Extension; 79 class Extension;
80 class WindowController;
81 } 81 }
82 82
83 namespace gfx { 83 namespace gfx {
84 class Point; 84 class Point;
85 } 85 }
86 86
87 namespace ui { 87 namespace ui {
88 class WebDialogDelegate; 88 class WebDialogDelegate;
89 } 89 }
90 90
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 // Called each time the browser window is shown. 473 // Called each time the browser window is shown.
474 void OnWindowDidShow(); 474 void OnWindowDidShow();
475 475
476 // Show the first run search engine bubble on the location bar. 476 // Show the first run search engine bubble on the location bar.
477 void ShowFirstRunBubble(); 477 void ShowFirstRunBubble();
478 478
479 FullscreenController* fullscreen_controller() { 479 FullscreenController* fullscreen_controller() {
480 return fullscreen_controller_.get(); 480 return fullscreen_controller_.get();
481 } 481 }
482 482
483 ExtensionWindowController* extension_window_controller() const { 483 extensions::WindowController* extension_window_controller() const {
484 return extension_window_controller_.get(); 484 return extension_window_controller_.get();
485 } 485 }
486 486
487 protected: 487 protected:
488 // Funnel for the factory method in BrowserWindow. This allows subclasses to 488 // Funnel for the factory method in BrowserWindow. This allows subclasses to
489 // set their own window. 489 // set their own window.
490 virtual BrowserWindow* CreateBrowserWindow(); 490 virtual BrowserWindow* CreateBrowserWindow();
491 491
492 private: 492 private:
493 friend class BrowserTest; 493 friend class BrowserTest;
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 // Helper which implements the SyncedWindowDelegate interface. 910 // Helper which implements the SyncedWindowDelegate interface.
911 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; 911 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_;
912 912
913 scoped_ptr<chrome::BrowserInstantController> instant_controller_; 913 scoped_ptr<chrome::BrowserInstantController> instant_controller_;
914 914
915 BookmarkBar::State bookmark_bar_state_; 915 BookmarkBar::State bookmark_bar_state_;
916 DeviceAttachedIntentSource device_attached_intent_source_; 916 DeviceAttachedIntentSource device_attached_intent_source_;
917 917
918 scoped_refptr<FullscreenController> fullscreen_controller_; 918 scoped_refptr<FullscreenController> fullscreen_controller_;
919 919
920 scoped_ptr<ExtensionWindowController> extension_window_controller_; 920 scoped_ptr<extensions::WindowController> extension_window_controller_;
921 921
922 scoped_ptr<chrome::BrowserCommandController> command_controller_; 922 scoped_ptr<chrome::BrowserCommandController> command_controller_;
923 923
924 // True if the browser window has been shown at least once. 924 // True if the browser window has been shown at least once.
925 bool window_has_shown_; 925 bool window_has_shown_;
926 926
927 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 927 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
928 // before DidEndColorChooser is called. 928 // before DidEndColorChooser is called.
929 scoped_ptr<content::ColorChooser> color_chooser_; 929 scoped_ptr<content::ColorChooser> color_chooser_;
930 930
931 DISALLOW_COPY_AND_ASSIGN(Browser); 931 DISALLOW_COPY_AND_ASSIGN(Browser);
932 }; 932 };
933 933
934 #endif // CHROME_BROWSER_UI_BROWSER_H_ 934 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/notifications/balloon_host.cc ('k') | chrome/browser/ui/extensions/shell_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698