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 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 | 455 |
456 // Show the first run search engine bubble on the location bar. | 456 // Show the first run search engine bubble on the location bar. |
457 void ShowFirstRunBubble(); | 457 void ShowFirstRunBubble(); |
458 | 458 |
459 // If necessary, update the bookmark bar state according to the Instant | 459 // If necessary, update the bookmark bar state according to the Instant |
460 // overlay state: when Instant overlay shows suggestions and bookmark bar is | 460 // overlay state: when Instant overlay shows suggestions and bookmark bar is |
461 // still showing attached, hide it. | 461 // still showing attached, hide it. |
462 void MaybeUpdateBookmarkBarStateForInstantOverlay( | 462 void MaybeUpdateBookmarkBarStateForInstantOverlay( |
463 const chrome::search::Mode& mode); | 463 const chrome::search::Mode& mode); |
464 | 464 |
| 465 // Show a download on the download shelf. |
| 466 void ShowDownload(content::DownloadItem* download); |
| 467 |
465 FullscreenController* fullscreen_controller() const { | 468 FullscreenController* fullscreen_controller() const { |
466 return fullscreen_controller_.get(); | 469 return fullscreen_controller_.get(); |
467 } | 470 } |
468 | 471 |
469 extensions::WindowController* extension_window_controller() const { | 472 extensions::WindowController* extension_window_controller() const { |
470 return extension_window_controller_.get(); | 473 return extension_window_controller_.get(); |
471 } | 474 } |
472 | 475 |
473 private: | 476 private: |
474 friend class BrowserTest; | 477 friend class BrowserTest; |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
554 virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE; | 557 virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE; |
555 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; | 558 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; |
556 virtual void BeforeUnloadFired(content::WebContents* source, | 559 virtual void BeforeUnloadFired(content::WebContents* source, |
557 bool proceed, | 560 bool proceed, |
558 bool* proceed_to_fire_unload) OVERRIDE; | 561 bool* proceed_to_fire_unload) OVERRIDE; |
559 virtual bool ShouldFocusLocationBarByDefault( | 562 virtual bool ShouldFocusLocationBarByDefault( |
560 content::WebContents* source) OVERRIDE; | 563 content::WebContents* source) OVERRIDE; |
561 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; | 564 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; |
562 virtual void RenderWidgetShowing() OVERRIDE; | 565 virtual void RenderWidgetShowing() OVERRIDE; |
563 virtual int GetExtraRenderViewHeight() const OVERRIDE; | 566 virtual int GetExtraRenderViewHeight() const OVERRIDE; |
564 virtual void OnStartDownload(content::WebContents* source, | |
565 content::DownloadItem* download) OVERRIDE; | |
566 virtual void ViewSourceForTab(content::WebContents* source, | 567 virtual void ViewSourceForTab(content::WebContents* source, |
567 const GURL& page_url) OVERRIDE; | 568 const GURL& page_url) OVERRIDE; |
568 virtual void ViewSourceForFrame( | 569 virtual void ViewSourceForFrame( |
569 content::WebContents* source, | 570 content::WebContents* source, |
570 const GURL& frame_url, | 571 const GURL& frame_url, |
571 const std::string& frame_content_state) OVERRIDE; | 572 const std::string& frame_content_state) OVERRIDE; |
572 virtual void ShowRepostFormWarningDialog( | 573 virtual void ShowRepostFormWarningDialog( |
573 content::WebContents* source) OVERRIDE; | 574 content::WebContents* source) OVERRIDE; |
574 virtual bool ShouldCreateWebContents( | 575 virtual bool ShouldCreateWebContents( |
575 content::WebContents* web_contents, | 576 content::WebContents* web_contents, |
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
927 bool window_has_shown_; | 928 bool window_has_shown_; |
928 | 929 |
929 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 930 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
930 // before DidEndColorChooser is called. | 931 // before DidEndColorChooser is called. |
931 scoped_ptr<content::ColorChooser> color_chooser_; | 932 scoped_ptr<content::ColorChooser> color_chooser_; |
932 | 933 |
933 DISALLOW_COPY_AND_ASSIGN(Browser); | 934 DISALLOW_COPY_AND_ASSIGN(Browser); |
934 }; | 935 }; |
935 | 936 |
936 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 937 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |