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_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 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
479 | 479 |
480 // Show the first run search engine bubble on the location bar. | 480 // Show the first run search engine bubble on the location bar. |
481 void ShowFirstRunBubble(); | 481 void ShowFirstRunBubble(); |
482 | 482 |
483 // If necessary, update the bookmark bar state according to the instant | 483 // If necessary, update the bookmark bar state according to the instant |
484 // preview state: when instant preview shows suggestions and bookmark bar is | 484 // preview state: when instant preview shows suggestions and bookmark bar is |
485 // still showing attached, start the animation to hide it. | 485 // still showing attached, start the animation to hide it. |
486 void MaybeUpdateBookmarkBarStateForInstantPreview( | 486 void MaybeUpdateBookmarkBarStateForInstantPreview( |
487 const chrome::search::Mode& mode); | 487 const chrome::search::Mode& mode); |
488 | 488 |
489 // Show a download on the download shelf. | |
490 void ShowDownload(content::DownloadItem* download); | |
Randy Smith (Not in Mondays)
2012/12/20 23:09:25
So an alternate design would have been to have eac
asanka
2012/12/20 23:56:19
a) DownloadShelf objects aren't created for every
| |
491 | |
489 FullscreenController* fullscreen_controller() { | 492 FullscreenController* fullscreen_controller() { |
490 return fullscreen_controller_.get(); | 493 return fullscreen_controller_.get(); |
491 } | 494 } |
492 | 495 |
493 extensions::WindowController* extension_window_controller() const { | 496 extensions::WindowController* extension_window_controller() const { |
494 return extension_window_controller_.get(); | 497 return extension_window_controller_.get(); |
495 } | 498 } |
496 | 499 |
497 private: | 500 private: |
498 friend class BrowserTest; | 501 friend class BrowserTest; |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
577 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; | 580 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; |
578 virtual void WebContentsFocused(content::WebContents* content) OVERRIDE; | 581 virtual void WebContentsFocused(content::WebContents* content) OVERRIDE; |
579 virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE; | 582 virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE; |
580 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; | 583 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; |
581 virtual void BeforeUnloadFired(content::WebContents* source, | 584 virtual void BeforeUnloadFired(content::WebContents* source, |
582 bool proceed, | 585 bool proceed, |
583 bool* proceed_to_fire_unload) OVERRIDE; | 586 bool* proceed_to_fire_unload) OVERRIDE; |
584 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; | 587 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; |
585 virtual void RenderWidgetShowing() OVERRIDE; | 588 virtual void RenderWidgetShowing() OVERRIDE; |
586 virtual int GetExtraRenderViewHeight() const OVERRIDE; | 589 virtual int GetExtraRenderViewHeight() const OVERRIDE; |
587 virtual void OnStartDownload(content::WebContents* source, | |
588 content::DownloadItem* download) OVERRIDE; | |
589 virtual void ViewSourceForTab(content::WebContents* source, | 590 virtual void ViewSourceForTab(content::WebContents* source, |
590 const GURL& page_url) OVERRIDE; | 591 const GURL& page_url) OVERRIDE; |
591 virtual void ViewSourceForFrame( | 592 virtual void ViewSourceForFrame( |
592 content::WebContents* source, | 593 content::WebContents* source, |
593 const GURL& frame_url, | 594 const GURL& frame_url, |
594 const std::string& frame_content_state) OVERRIDE; | 595 const std::string& frame_content_state) OVERRIDE; |
595 virtual void ShowRepostFormWarningDialog( | 596 virtual void ShowRepostFormWarningDialog( |
596 content::WebContents* source) OVERRIDE; | 597 content::WebContents* source) OVERRIDE; |
597 virtual bool ShouldCreateWebContents( | 598 virtual bool ShouldCreateWebContents( |
598 content::WebContents* web_contents, | 599 content::WebContents* web_contents, |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
960 bool window_has_shown_; | 961 bool window_has_shown_; |
961 | 962 |
962 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 963 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
963 // before DidEndColorChooser is called. | 964 // before DidEndColorChooser is called. |
964 scoped_ptr<content::ColorChooser> color_chooser_; | 965 scoped_ptr<content::ColorChooser> color_chooser_; |
965 | 966 |
966 DISALLOW_COPY_AND_ASSIGN(Browser); | 967 DISALLOW_COPY_AND_ASSIGN(Browser); |
967 }; | 968 }; |
968 | 969 |
969 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 970 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |