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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 8289022: Wires keeping the launcher up to date with the browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 years, 2 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
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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 28 matching lines...) Expand all
39 // view: http://dev.chromium.org/developers/design-documents/browser-window 39 // view: http://dev.chromium.org/developers/design-documents/browser-window
40 40
41 class AccessiblePaneView; 41 class AccessiblePaneView;
42 class BookmarkBarView; 42 class BookmarkBarView;
43 class Browser; 43 class Browser;
44 class BrowserBubble; 44 class BrowserBubble;
45 class BrowserViewLayout; 45 class BrowserViewLayout;
46 class ContentsContainer; 46 class ContentsContainer;
47 class DownloadShelfView; 47 class DownloadShelfView;
48 class EncodingMenuModel; 48 class EncodingMenuModel;
49 class Extension;
49 class FullscreenExitBubbleViews; 50 class FullscreenExitBubbleViews;
50 class HtmlDialogUIDelegate; 51 class HtmlDialogUIDelegate;
51 class InfoBarContainerView; 52 class InfoBarContainerView;
52 class LocationBarView; 53 class LocationBarView;
53 class SideTabStrip; 54 class SideTabStrip;
54 class StatusBubbleViews; 55 class StatusBubbleViews;
55 class TabContentsContainer; 56 class TabContentsContainer;
56 class TabStripModel; 57 class TabStripModel;
57 class ToolbarView; 58 class ToolbarView;
58 class ZoomMenuModel; 59 class ZoomMenuModel;
59 class Extension;
60 60
61 #if defined(OS_WIN) 61 #if defined(OS_WIN)
62 class AeroPeekManager; 62 class AeroPeekManager;
63 class JumpList; 63 class JumpList;
64 #endif 64 #endif
65 65
66 #if defined(USE_AURA)
67 class LauncherIconUpdater;
68 #endif
69
66 namespace views { 70 namespace views {
67 class ExternalFocusTracker; 71 class ExternalFocusTracker;
68 class Menu; 72 class Menu;
69 } 73 }
70 74
71 /////////////////////////////////////////////////////////////////////////////// 75 ///////////////////////////////////////////////////////////////////////////////
72 // BrowserView 76 // BrowserView
73 // 77 //
74 // A ClientView subclass that provides the contents of a browser window, 78 // A ClientView subclass that provides the contents of a browser window,
75 // including the TabStrip, toolbars, download shelves, the content area etc. 79 // including the TabStrip, toolbars, download shelves, the content area etc.
(...skipping 12 matching lines...) Expand all
88 public: 92 public:
89 // The browser view's class name. 93 // The browser view's class name.
90 static const char kViewClassName[]; 94 static const char kViewClassName[];
91 95
92 explicit BrowserView(Browser* browser); 96 explicit BrowserView(Browser* browser);
93 virtual ~BrowserView(); 97 virtual ~BrowserView();
94 98
95 void set_frame(BrowserFrame* frame) { frame_ = frame; } 99 void set_frame(BrowserFrame* frame) { frame_ = frame; }
96 BrowserFrame* frame() const { return frame_; } 100 BrowserFrame* frame() const { return frame_; }
97 101
98 #if defined(OS_WIN) && !defined(USE_AURA) 102 #if defined(OS_WIN) || defined(USE_AURA)
99 // Returns a pointer to the BrowserView* interface implementation (an 103 // Returns a pointer to the BrowserView* interface implementation (an
100 // instance of this object, typically) for a given native window, or NULL if 104 // instance of this object, typically) for a given native window, or NULL if
101 // there is no such association. 105 // there is no such association.
102 // 106 //
103 // Don't use this unless you only have a NativeWindow. In nearly all 107 // Don't use this unless you only have a NativeWindow. In nearly all
104 // situations plumb through browser and use it. 108 // situations plumb through browser and use it.
105 static BrowserView* GetBrowserViewForNativeWindow(gfx::NativeWindow window); 109 static BrowserView* GetBrowserViewForNativeWindow(gfx::NativeWindow window);
106 #endif 110 #endif
107 111
108 // Returns the BrowserView used for the specified Browser. 112 // Returns the BrowserView used for the specified Browser.
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 // plugin window. 677 // plugin window.
674 HungPluginAction hung_plugin_action_; 678 HungPluginAction hung_plugin_action_;
675 679
676 // The custom JumpList for Windows 7. 680 // The custom JumpList for Windows 7.
677 scoped_refptr<JumpList> jumplist_; 681 scoped_refptr<JumpList> jumplist_;
678 682
679 // The custom AeroPeek manager for Windows 7. 683 // The custom AeroPeek manager for Windows 7.
680 scoped_ptr<AeroPeekManager> aeropeek_manager_; 684 scoped_ptr<AeroPeekManager> aeropeek_manager_;
681 #endif 685 #endif
682 686
687 #if defined(USE_AURA)
688 scoped_ptr<LauncherIconUpdater> icon_updater_;
689 #endif
690
683 // The timer used to update frames for the Loading Animation. 691 // The timer used to update frames for the Loading Animation.
684 base::RepeatingTimer<BrowserView> loading_animation_timer_; 692 base::RepeatingTimer<BrowserView> loading_animation_timer_;
685 693
686 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; 694 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
687 695
688 NotificationRegistrar registrar_; 696 NotificationRegistrar registrar_;
689 697
690 // Used to measure the loading spinner animation rate. 698 // Used to measure the loading spinner animation rate.
691 base::TimeTicks last_animation_time_; 699 base::TimeTicks last_animation_time_;
692 700
693 // If this flag is set then SetFocusToLocationBar() will set focus to the 701 // If this flag is set then SetFocusToLocationBar() will set focus to the
694 // location bar even if the browser window is not active. 702 // location bar even if the browser window is not active.
695 bool force_location_bar_focus_; 703 bool force_location_bar_focus_;
696 704
697 DISALLOW_COPY_AND_ASSIGN(BrowserView); 705 DISALLOW_COPY_AND_ASSIGN(BrowserView);
698 }; 706 };
699 707
700 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 708 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/aura/launcher_icon_updater.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698