OLD | NEW |
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_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 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 // Test support. | 239 // Test support. |
240 // Note: This is only needed to be BrowserLauncherItemController instead of | 240 // Note: This is only needed to be BrowserLauncherItemController instead of |
241 // LauncherItemController because of the "favicon_loader" member - to be more | 241 // LauncherItemController because of the "favicon_loader" member - to be more |
242 // exact that member function is the only one being called. | 242 // exact that member function is the only one being called. |
243 // TODO(skuhne): Remove once per-app is default. | 243 // TODO(skuhne): Remove once per-app is default. |
244 BrowserLauncherItemController* launcher_item_controller() const { | 244 BrowserLauncherItemController* launcher_item_controller() const { |
245 return launcher_item_controller_.get(); | 245 return launcher_item_controller_.get(); |
246 } | 246 } |
247 #endif | 247 #endif |
248 | 248 |
| 249 BookmarkBarView* bookmark_bar() const { |
| 250 return bookmark_bar_view_.get(); |
| 251 } |
| 252 |
249 // Overridden from BrowserWindow: | 253 // Overridden from BrowserWindow: |
250 virtual void Show() OVERRIDE; | 254 virtual void Show() OVERRIDE; |
251 virtual void ShowInactive() OVERRIDE; | 255 virtual void ShowInactive() OVERRIDE; |
252 virtual void Hide() OVERRIDE; | 256 virtual void Hide() OVERRIDE; |
253 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; | 257 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; |
254 virtual void Close() OVERRIDE; | 258 virtual void Close() OVERRIDE; |
255 virtual void Activate() OVERRIDE; | 259 virtual void Activate() OVERRIDE; |
256 virtual void Deactivate() OVERRIDE; | 260 virtual void Deactivate() OVERRIDE; |
257 virtual bool IsActive() const OVERRIDE; | 261 virtual bool IsActive() const OVERRIDE; |
258 virtual void FlashFrame(bool flash) OVERRIDE; | 262 virtual void FlashFrame(bool flash) OVERRIDE; |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
584 // Calls |method| which is either RenderWidgetHost::Cut, ::Copy, or ::Paste on | 588 // Calls |method| which is either RenderWidgetHost::Cut, ::Copy, or ::Paste on |
585 // the given WebContents, returning true if it consumed the event. | 589 // the given WebContents, returning true if it consumed the event. |
586 bool DoCutCopyPasteForWebContents( | 590 bool DoCutCopyPasteForWebContents( |
587 content::WebContents* contents, | 591 content::WebContents* contents, |
588 void (content::RenderWidgetHost::*method)()); | 592 void (content::RenderWidgetHost::*method)()); |
589 | 593 |
590 // Shows the next app-modal dialog box, if there is one to be shown, or moves | 594 // Shows the next app-modal dialog box, if there is one to be shown, or moves |
591 // an existing showing one to the front. | 595 // an existing showing one to the front. |
592 void ActivateAppModalDialog() const; | 596 void ActivateAppModalDialog() const; |
593 | 597 |
594 // If search mode is |MODE_NTP| and bookmark bar is visible, stack it at top. | |
595 void MaybeStackBookmarkBarAtTop(); | |
596 | |
597 // Last focused view that issued a tab traversal. | 598 // Last focused view that issued a tab traversal. |
598 int last_focused_view_storage_id_; | 599 int last_focused_view_storage_id_; |
599 | 600 |
600 // The BrowserFrame that hosts this view. | 601 // The BrowserFrame that hosts this view. |
601 BrowserFrame* frame_; | 602 BrowserFrame* frame_; |
602 | 603 |
603 // The Browser object we are associated with. | 604 // The Browser object we are associated with. |
604 scoped_ptr<Browser> browser_; | 605 scoped_ptr<Browser> browser_; |
605 | 606 |
606 // BrowserView layout (LTR one is pictured here). | 607 // BrowserView layout (LTR one is pictured here). |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
753 gfx::ScopedSysColorChangeListener color_change_listener_; | 754 gfx::ScopedSysColorChangeListener color_change_listener_; |
754 | 755 |
755 scoped_ptr<InstantPreviewControllerViews> preview_controller_; | 756 scoped_ptr<InstantPreviewControllerViews> preview_controller_; |
756 | 757 |
757 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 758 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
758 | 759 |
759 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 760 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
760 }; | 761 }; |
761 | 762 |
762 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 763 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |