| 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 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 // Called by chrome::Navigate() when a navigation has occurred in a tab in | 393 // Called by chrome::Navigate() when a navigation has occurred in a tab in |
| 394 // this Browser. Updates the UI for the start of this navigation. | 394 // this Browser. Updates the UI for the start of this navigation. |
| 395 void UpdateUIForNavigationInTab(content::WebContents* contents, | 395 void UpdateUIForNavigationInTab(content::WebContents* contents, |
| 396 ui::PageTransition transition, | 396 ui::PageTransition transition, |
| 397 bool user_initiated); | 397 bool user_initiated); |
| 398 | 398 |
| 399 // Interface implementations //////////////////////////////////////////////// | 399 // Interface implementations //////////////////////////////////////////////// |
| 400 | 400 |
| 401 // Overridden from content::PageNavigator: | 401 // Overridden from content::PageNavigator: |
| 402 virtual content::WebContents* OpenURL( | 402 virtual content::WebContents* OpenURL( |
| 403 const content::OpenURLParams& params) OVERRIDE; | 403 const content::OpenURLParams& params) override; |
| 404 | 404 |
| 405 // Overridden from TabStripModelObserver: | 405 // Overridden from TabStripModelObserver: |
| 406 virtual void TabInsertedAt(content::WebContents* contents, | 406 virtual void TabInsertedAt(content::WebContents* contents, |
| 407 int index, | 407 int index, |
| 408 bool foreground) OVERRIDE; | 408 bool foreground) override; |
| 409 virtual void TabClosingAt(TabStripModel* tab_strip_model, | 409 virtual void TabClosingAt(TabStripModel* tab_strip_model, |
| 410 content::WebContents* contents, | 410 content::WebContents* contents, |
| 411 int index) OVERRIDE; | 411 int index) override; |
| 412 virtual void TabDetachedAt(content::WebContents* contents, | 412 virtual void TabDetachedAt(content::WebContents* contents, |
| 413 int index) OVERRIDE; | 413 int index) override; |
| 414 virtual void TabDeactivated(content::WebContents* contents) OVERRIDE; | 414 virtual void TabDeactivated(content::WebContents* contents) override; |
| 415 virtual void ActiveTabChanged(content::WebContents* old_contents, | 415 virtual void ActiveTabChanged(content::WebContents* old_contents, |
| 416 content::WebContents* new_contents, | 416 content::WebContents* new_contents, |
| 417 int index, | 417 int index, |
| 418 int reason) OVERRIDE; | 418 int reason) override; |
| 419 virtual void TabMoved(content::WebContents* contents, | 419 virtual void TabMoved(content::WebContents* contents, |
| 420 int from_index, | 420 int from_index, |
| 421 int to_index) OVERRIDE; | 421 int to_index) override; |
| 422 virtual void TabReplacedAt(TabStripModel* tab_strip_model, | 422 virtual void TabReplacedAt(TabStripModel* tab_strip_model, |
| 423 content::WebContents* old_contents, | 423 content::WebContents* old_contents, |
| 424 content::WebContents* new_contents, | 424 content::WebContents* new_contents, |
| 425 int index) OVERRIDE; | 425 int index) override; |
| 426 virtual void TabPinnedStateChanged(content::WebContents* contents, | 426 virtual void TabPinnedStateChanged(content::WebContents* contents, |
| 427 int index) OVERRIDE; | 427 int index) override; |
| 428 virtual void TabStripEmpty() OVERRIDE; | 428 virtual void TabStripEmpty() override; |
| 429 | 429 |
| 430 // Overridden from content::WebContentsDelegate: | 430 // Overridden from content::WebContentsDelegate: |
| 431 virtual bool CanOverscrollContent() const OVERRIDE; | 431 virtual bool CanOverscrollContent() const override; |
| 432 virtual bool ShouldPreserveAbortedURLs(content::WebContents* source) OVERRIDE; | 432 virtual bool ShouldPreserveAbortedURLs(content::WebContents* source) override; |
| 433 virtual bool PreHandleKeyboardEvent( | 433 virtual bool PreHandleKeyboardEvent( |
| 434 content::WebContents* source, | 434 content::WebContents* source, |
| 435 const content::NativeWebKeyboardEvent& event, | 435 const content::NativeWebKeyboardEvent& event, |
| 436 bool* is_keyboard_shortcut) OVERRIDE; | 436 bool* is_keyboard_shortcut) override; |
| 437 virtual void HandleKeyboardEvent( | 437 virtual void HandleKeyboardEvent( |
| 438 content::WebContents* source, | 438 content::WebContents* source, |
| 439 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 439 const content::NativeWebKeyboardEvent& event) override; |
| 440 virtual void OverscrollUpdate(int delta_y) OVERRIDE; | 440 virtual void OverscrollUpdate(int delta_y) override; |
| 441 virtual void ShowValidationMessage(content::WebContents* web_contents, | 441 virtual void ShowValidationMessage(content::WebContents* web_contents, |
| 442 const gfx::Rect& anchor_in_root_view, | 442 const gfx::Rect& anchor_in_root_view, |
| 443 const base::string16& main_text, | 443 const base::string16& main_text, |
| 444 const base::string16& sub_text) OVERRIDE; | 444 const base::string16& sub_text) override; |
| 445 virtual void HideValidationMessage( | 445 virtual void HideValidationMessage( |
| 446 content::WebContents* web_contents) OVERRIDE; | 446 content::WebContents* web_contents) override; |
| 447 virtual void MoveValidationMessage( | 447 virtual void MoveValidationMessage( |
| 448 content::WebContents* web_contents, | 448 content::WebContents* web_contents, |
| 449 const gfx::Rect& anchor_in_root_view) OVERRIDE; | 449 const gfx::Rect& anchor_in_root_view) override; |
| 450 virtual bool PreHandleGestureEvent( | 450 virtual bool PreHandleGestureEvent( |
| 451 content::WebContents* source, | 451 content::WebContents* source, |
| 452 const blink::WebGestureEvent& event) OVERRIDE; | 452 const blink::WebGestureEvent& event) override; |
| 453 virtual bool CanDragEnter( | 453 virtual bool CanDragEnter( |
| 454 content::WebContents* source, | 454 content::WebContents* source, |
| 455 const content::DropData& data, | 455 const content::DropData& data, |
| 456 blink::WebDragOperationsMask operations_allowed) OVERRIDE; | 456 blink::WebDragOperationsMask operations_allowed) override; |
| 457 | 457 |
| 458 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } | 458 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } |
| 459 bool is_type_popup() const { return type_ == TYPE_POPUP; } | 459 bool is_type_popup() const { return type_ == TYPE_POPUP; } |
| 460 | 460 |
| 461 bool is_app() const; | 461 bool is_app() const; |
| 462 bool is_devtools() const; | 462 bool is_devtools() const; |
| 463 | 463 |
| 464 // True when the mouse cursor is locked. | 464 // True when the mouse cursor is locked. |
| 465 bool IsMouseLocked() const; | 465 bool IsMouseLocked() const; |
| 466 | 466 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 // Change is the result of a state change in the active tab. | 532 // Change is the result of a state change in the active tab. |
| 533 BOOKMARK_BAR_STATE_CHANGE_TAB_STATE, | 533 BOOKMARK_BAR_STATE_CHANGE_TAB_STATE, |
| 534 | 534 |
| 535 // Change is the result of window toggling in/out of fullscreen mode. | 535 // Change is the result of window toggling in/out of fullscreen mode. |
| 536 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, | 536 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, |
| 537 }; | 537 }; |
| 538 | 538 |
| 539 // Overridden from content::WebContentsDelegate: | 539 // Overridden from content::WebContentsDelegate: |
| 540 virtual content::WebContents* OpenURLFromTab( | 540 virtual content::WebContents* OpenURLFromTab( |
| 541 content::WebContents* source, | 541 content::WebContents* source, |
| 542 const content::OpenURLParams& params) OVERRIDE; | 542 const content::OpenURLParams& params) override; |
| 543 virtual void NavigationStateChanged( | 543 virtual void NavigationStateChanged( |
| 544 const content::WebContents* source, | 544 const content::WebContents* source, |
| 545 content::InvalidateTypes changed_flags) OVERRIDE; | 545 content::InvalidateTypes changed_flags) override; |
| 546 virtual void VisibleSSLStateChanged( | 546 virtual void VisibleSSLStateChanged( |
| 547 const content::WebContents* source) OVERRIDE; | 547 const content::WebContents* source) override; |
| 548 virtual void AddNewContents(content::WebContents* source, | 548 virtual void AddNewContents(content::WebContents* source, |
| 549 content::WebContents* new_contents, | 549 content::WebContents* new_contents, |
| 550 WindowOpenDisposition disposition, | 550 WindowOpenDisposition disposition, |
| 551 const gfx::Rect& initial_pos, | 551 const gfx::Rect& initial_pos, |
| 552 bool user_gesture, | 552 bool user_gesture, |
| 553 bool* was_blocked) OVERRIDE; | 553 bool* was_blocked) override; |
| 554 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; | 554 virtual void ActivateContents(content::WebContents* contents) override; |
| 555 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; | 555 virtual void DeactivateContents(content::WebContents* contents) override; |
| 556 virtual void LoadingStateChanged(content::WebContents* source, | 556 virtual void LoadingStateChanged(content::WebContents* source, |
| 557 bool to_different_document) OVERRIDE; | 557 bool to_different_document) override; |
| 558 virtual void CloseContents(content::WebContents* source) OVERRIDE; | 558 virtual void CloseContents(content::WebContents* source) override; |
| 559 virtual void MoveContents(content::WebContents* source, | 559 virtual void MoveContents(content::WebContents* source, |
| 560 const gfx::Rect& pos) OVERRIDE; | 560 const gfx::Rect& pos) override; |
| 561 virtual bool IsPopupOrPanel( | 561 virtual bool IsPopupOrPanel( |
| 562 const content::WebContents* source) const OVERRIDE; | 562 const content::WebContents* source) const override; |
| 563 virtual void UpdateTargetURL(content::WebContents* source, | 563 virtual void UpdateTargetURL(content::WebContents* source, |
| 564 const GURL& url) OVERRIDE; | 564 const GURL& url) override; |
| 565 virtual void ContentsMouseEvent(content::WebContents* source, | 565 virtual void ContentsMouseEvent(content::WebContents* source, |
| 566 const gfx::Point& location, | 566 const gfx::Point& location, |
| 567 bool motion) OVERRIDE; | 567 bool motion) override; |
| 568 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; | 568 virtual void ContentsZoomChange(bool zoom_in) override; |
| 569 virtual void WebContentsFocused(content::WebContents* content) OVERRIDE; | 569 virtual void WebContentsFocused(content::WebContents* content) override; |
| 570 virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE; | 570 virtual bool TakeFocus(content::WebContents* source, bool reverse) override; |
| 571 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; | 571 virtual gfx::Rect GetRootWindowResizerRect() const override; |
| 572 virtual void BeforeUnloadFired(content::WebContents* source, | 572 virtual void BeforeUnloadFired(content::WebContents* source, |
| 573 bool proceed, | 573 bool proceed, |
| 574 bool* proceed_to_fire_unload) OVERRIDE; | 574 bool* proceed_to_fire_unload) override; |
| 575 virtual bool ShouldFocusLocationBarByDefault( | 575 virtual bool ShouldFocusLocationBarByDefault( |
| 576 content::WebContents* source) OVERRIDE; | 576 content::WebContents* source) override; |
| 577 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; | 577 virtual void SetFocusToLocationBar(bool select_all) override; |
| 578 virtual int GetExtraRenderViewHeight() const OVERRIDE; | 578 virtual int GetExtraRenderViewHeight() const override; |
| 579 virtual void ViewSourceForTab(content::WebContents* source, | 579 virtual void ViewSourceForTab(content::WebContents* source, |
| 580 const GURL& page_url) OVERRIDE; | 580 const GURL& page_url) override; |
| 581 virtual void ViewSourceForFrame( | 581 virtual void ViewSourceForFrame( |
| 582 content::WebContents* source, | 582 content::WebContents* source, |
| 583 const GURL& frame_url, | 583 const GURL& frame_url, |
| 584 const content::PageState& frame_page_state) OVERRIDE; | 584 const content::PageState& frame_page_state) override; |
| 585 virtual void ShowRepostFormWarningDialog( | 585 virtual void ShowRepostFormWarningDialog( |
| 586 content::WebContents* source) OVERRIDE; | 586 content::WebContents* source) override; |
| 587 virtual bool ShouldCreateWebContents( | 587 virtual bool ShouldCreateWebContents( |
| 588 content::WebContents* web_contents, | 588 content::WebContents* web_contents, |
| 589 int route_id, | 589 int route_id, |
| 590 WindowContainerType window_container_type, | 590 WindowContainerType window_container_type, |
| 591 const base::string16& frame_name, | 591 const base::string16& frame_name, |
| 592 const GURL& target_url, | 592 const GURL& target_url, |
| 593 const std::string& partition_id, | 593 const std::string& partition_id, |
| 594 content::SessionStorageNamespace* session_storage_namespace) OVERRIDE; | 594 content::SessionStorageNamespace* session_storage_namespace) override; |
| 595 virtual void WebContentsCreated(content::WebContents* source_contents, | 595 virtual void WebContentsCreated(content::WebContents* source_contents, |
| 596 int opener_render_frame_id, | 596 int opener_render_frame_id, |
| 597 const base::string16& frame_name, | 597 const base::string16& frame_name, |
| 598 const GURL& target_url, | 598 const GURL& target_url, |
| 599 content::WebContents* new_contents) OVERRIDE; | 599 content::WebContents* new_contents) override; |
| 600 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 600 virtual void RendererUnresponsive(content::WebContents* source) override; |
| 601 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 601 virtual void RendererResponsive(content::WebContents* source) override; |
| 602 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; | 602 virtual void WorkerCrashed(content::WebContents* source) override; |
| 603 virtual void DidNavigateMainFramePostCommit( | 603 virtual void DidNavigateMainFramePostCommit( |
| 604 content::WebContents* web_contents) OVERRIDE; | 604 content::WebContents* web_contents) override; |
| 605 virtual void DidNavigateToPendingEntry( | 605 virtual void DidNavigateToPendingEntry( |
| 606 content::WebContents* web_contents) OVERRIDE; | 606 content::WebContents* web_contents) override; |
| 607 virtual content::JavaScriptDialogManager* | 607 virtual content::JavaScriptDialogManager* |
| 608 GetJavaScriptDialogManager() OVERRIDE; | 608 GetJavaScriptDialogManager() override; |
| 609 virtual content::ColorChooser* OpenColorChooser( | 609 virtual content::ColorChooser* OpenColorChooser( |
| 610 content::WebContents* web_contents, | 610 content::WebContents* web_contents, |
| 611 SkColor color, | 611 SkColor color, |
| 612 const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE; | 612 const std::vector<content::ColorSuggestion>& suggestions) override; |
| 613 virtual void RunFileChooser( | 613 virtual void RunFileChooser( |
| 614 content::WebContents* web_contents, | 614 content::WebContents* web_contents, |
| 615 const content::FileChooserParams& params) OVERRIDE; | 615 const content::FileChooserParams& params) override; |
| 616 virtual void EnumerateDirectory(content::WebContents* web_contents, | 616 virtual void EnumerateDirectory(content::WebContents* web_contents, |
| 617 int request_id, | 617 int request_id, |
| 618 const base::FilePath& path) OVERRIDE; | 618 const base::FilePath& path) override; |
| 619 virtual bool EmbedsFullscreenWidget() const OVERRIDE; | 619 virtual bool EmbedsFullscreenWidget() const override; |
| 620 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, | 620 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, |
| 621 bool enter_fullscreen) OVERRIDE; | 621 bool enter_fullscreen) override; |
| 622 virtual bool IsFullscreenForTabOrPending( | 622 virtual bool IsFullscreenForTabOrPending( |
| 623 const content::WebContents* web_contents) const OVERRIDE; | 623 const content::WebContents* web_contents) const override; |
| 624 virtual void RegisterProtocolHandler(content::WebContents* web_contents, | 624 virtual void RegisterProtocolHandler(content::WebContents* web_contents, |
| 625 const std::string& protocol, | 625 const std::string& protocol, |
| 626 const GURL& url, | 626 const GURL& url, |
| 627 bool user_gesture) OVERRIDE; | 627 bool user_gesture) override; |
| 628 virtual void UnregisterProtocolHandler(content::WebContents* web_contents, | 628 virtual void UnregisterProtocolHandler(content::WebContents* web_contents, |
| 629 const std::string& protocol, | 629 const std::string& protocol, |
| 630 const GURL& url, | 630 const GURL& url, |
| 631 bool user_gesture) OVERRIDE; | 631 bool user_gesture) override; |
| 632 virtual void UpdatePreferredSize(content::WebContents* source, | 632 virtual void UpdatePreferredSize(content::WebContents* source, |
| 633 const gfx::Size& pref_size) OVERRIDE; | 633 const gfx::Size& pref_size) override; |
| 634 virtual void ResizeDueToAutoResize(content::WebContents* source, | 634 virtual void ResizeDueToAutoResize(content::WebContents* source, |
| 635 const gfx::Size& new_size) OVERRIDE; | 635 const gfx::Size& new_size) override; |
| 636 virtual void FindReply(content::WebContents* web_contents, | 636 virtual void FindReply(content::WebContents* web_contents, |
| 637 int request_id, | 637 int request_id, |
| 638 int number_of_matches, | 638 int number_of_matches, |
| 639 const gfx::Rect& selection_rect, | 639 const gfx::Rect& selection_rect, |
| 640 int active_match_ordinal, | 640 int active_match_ordinal, |
| 641 bool final_update) OVERRIDE; | 641 bool final_update) override; |
| 642 virtual void RequestToLockMouse(content::WebContents* web_contents, | 642 virtual void RequestToLockMouse(content::WebContents* web_contents, |
| 643 bool user_gesture, | 643 bool user_gesture, |
| 644 bool last_unlocked_by_target) OVERRIDE; | 644 bool last_unlocked_by_target) override; |
| 645 virtual void LostMouseLock() OVERRIDE; | 645 virtual void LostMouseLock() override; |
| 646 virtual void RequestMediaAccessPermission( | 646 virtual void RequestMediaAccessPermission( |
| 647 content::WebContents* web_contents, | 647 content::WebContents* web_contents, |
| 648 const content::MediaStreamRequest& request, | 648 const content::MediaStreamRequest& request, |
| 649 const content::MediaResponseCallback& callback) OVERRIDE; | 649 const content::MediaResponseCallback& callback) override; |
| 650 virtual bool CheckMediaAccessPermission( | 650 virtual bool CheckMediaAccessPermission( |
| 651 content::WebContents* web_contents, | 651 content::WebContents* web_contents, |
| 652 const GURL& security_origin, | 652 const GURL& security_origin, |
| 653 content::MediaStreamType type) OVERRIDE; | 653 content::MediaStreamType type) override; |
| 654 virtual bool RequestPpapiBrokerPermission( | 654 virtual bool RequestPpapiBrokerPermission( |
| 655 content::WebContents* web_contents, | 655 content::WebContents* web_contents, |
| 656 const GURL& url, | 656 const GURL& url, |
| 657 const base::FilePath& plugin_path, | 657 const base::FilePath& plugin_path, |
| 658 const base::Callback<void(bool)>& callback) OVERRIDE; | 658 const base::Callback<void(bool)>& callback) override; |
| 659 virtual gfx::Size GetSizeForNewRenderView( | 659 virtual gfx::Size GetSizeForNewRenderView( |
| 660 content::WebContents* web_contents) const OVERRIDE; | 660 content::WebContents* web_contents) const override; |
| 661 | 661 |
| 662 // Overridden from CoreTabHelperDelegate: | 662 // Overridden from CoreTabHelperDelegate: |
| 663 // Note that the caller is responsible for deleting |old_contents|. | 663 // Note that the caller is responsible for deleting |old_contents|. |
| 664 virtual void SwapTabContents(content::WebContents* old_contents, | 664 virtual void SwapTabContents(content::WebContents* old_contents, |
| 665 content::WebContents* new_contents, | 665 content::WebContents* new_contents, |
| 666 bool did_start_load, | 666 bool did_start_load, |
| 667 bool did_finish_load) OVERRIDE; | 667 bool did_finish_load) override; |
| 668 virtual bool CanReloadContents( | 668 virtual bool CanReloadContents( |
| 669 content::WebContents* web_contents) const OVERRIDE; | 669 content::WebContents* web_contents) const override; |
| 670 virtual bool CanSaveContents( | 670 virtual bool CanSaveContents( |
| 671 content::WebContents* web_contents) const OVERRIDE; | 671 content::WebContents* web_contents) const override; |
| 672 | 672 |
| 673 // Overridden from SearchEngineTabHelperDelegate: | 673 // Overridden from SearchEngineTabHelperDelegate: |
| 674 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 674 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, |
| 675 Profile* profile) OVERRIDE; | 675 Profile* profile) override; |
| 676 | 676 |
| 677 // Overridden from SearchTabHelperDelegate: | 677 // Overridden from SearchTabHelperDelegate: |
| 678 virtual void NavigateOnThumbnailClick( | 678 virtual void NavigateOnThumbnailClick( |
| 679 const GURL& url, | 679 const GURL& url, |
| 680 WindowOpenDisposition disposition, | 680 WindowOpenDisposition disposition, |
| 681 content::WebContents* source_contents) OVERRIDE; | 681 content::WebContents* source_contents) override; |
| 682 virtual void OnWebContentsInstantSupportDisabled( | 682 virtual void OnWebContentsInstantSupportDisabled( |
| 683 const content::WebContents* web_contents) OVERRIDE; | 683 const content::WebContents* web_contents) override; |
| 684 virtual OmniboxView* GetOmniboxView() OVERRIDE; | 684 virtual OmniboxView* GetOmniboxView() override; |
| 685 virtual std::set<std::string> GetOpenUrls() OVERRIDE; | 685 virtual std::set<std::string> GetOpenUrls() override; |
| 686 | 686 |
| 687 // Overridden from WebContentsModalDialogManagerDelegate: | 687 // Overridden from WebContentsModalDialogManagerDelegate: |
| 688 virtual void SetWebContentsBlocked(content::WebContents* web_contents, | 688 virtual void SetWebContentsBlocked(content::WebContents* web_contents, |
| 689 bool blocked) OVERRIDE; | 689 bool blocked) override; |
| 690 virtual web_modal::WebContentsModalDialogHost* | 690 virtual web_modal::WebContentsModalDialogHost* |
| 691 GetWebContentsModalDialogHost() OVERRIDE; | 691 GetWebContentsModalDialogHost() override; |
| 692 | 692 |
| 693 // Overridden from BookmarkTabHelperDelegate: | 693 // Overridden from BookmarkTabHelperDelegate: |
| 694 virtual void URLStarredChanged(content::WebContents* web_contents, | 694 virtual void URLStarredChanged(content::WebContents* web_contents, |
| 695 bool starred) OVERRIDE; | 695 bool starred) override; |
| 696 | 696 |
| 697 // Overridden from ZoomObserver: | 697 // Overridden from ZoomObserver: |
| 698 virtual void OnZoomChanged( | 698 virtual void OnZoomChanged( |
| 699 const ZoomController::ZoomChangedEventData& data) OVERRIDE; | 699 const ZoomController::ZoomChangedEventData& data) override; |
| 700 | 700 |
| 701 // Overridden from SelectFileDialog::Listener: | 701 // Overridden from SelectFileDialog::Listener: |
| 702 virtual void FileSelected(const base::FilePath& path, | 702 virtual void FileSelected(const base::FilePath& path, |
| 703 int index, | 703 int index, |
| 704 void* params) OVERRIDE; | 704 void* params) override; |
| 705 virtual void FileSelectedWithExtraInfo( | 705 virtual void FileSelectedWithExtraInfo( |
| 706 const ui::SelectedFileInfo& file_info, | 706 const ui::SelectedFileInfo& file_info, |
| 707 int index, | 707 int index, |
| 708 void* params) OVERRIDE; | 708 void* params) override; |
| 709 | 709 |
| 710 // Overridden from content::NotificationObserver: | 710 // Overridden from content::NotificationObserver: |
| 711 virtual void Observe(int type, | 711 virtual void Observe(int type, |
| 712 const content::NotificationSource& source, | 712 const content::NotificationSource& source, |
| 713 const content::NotificationDetails& details) OVERRIDE; | 713 const content::NotificationDetails& details) override; |
| 714 | 714 |
| 715 // Command and state updating /////////////////////////////////////////////// | 715 // Command and state updating /////////////////////////////////////////////// |
| 716 | 716 |
| 717 // Handle changes to kDevTools preference. | 717 // Handle changes to kDevTools preference. |
| 718 void OnDevToolsDisabledChanged(); | 718 void OnDevToolsDisabledChanged(); |
| 719 | 719 |
| 720 // UI update coalescing and handling //////////////////////////////////////// | 720 // UI update coalescing and handling //////////////////////////////////////// |
| 721 | 721 |
| 722 // Asks the toolbar (and as such the location bar) to update its state to | 722 // Asks the toolbar (and as such the location bar) to update its state to |
| 723 // reflect the current tab's current URL, security state, etc. | 723 // reflect the current tab's current URL, security state, etc. |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 958 | 958 |
| 959 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 959 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
| 960 | 960 |
| 961 // The following factory is used to close the frame at a later time. | 961 // The following factory is used to close the frame at a later time. |
| 962 base::WeakPtrFactory<Browser> weak_factory_; | 962 base::WeakPtrFactory<Browser> weak_factory_; |
| 963 | 963 |
| 964 DISALLOW_COPY_AND_ASSIGN(Browser); | 964 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 965 }; | 965 }; |
| 966 | 966 |
| 967 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 967 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |