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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 // This name will be set for: | 200 // This name will be set for: |
201 // 1) v1 applications launched via an application shortcut or extension API. | 201 // 1) v1 applications launched via an application shortcut or extension API. |
202 // 2) undocked devtool windows. | 202 // 2) undocked devtool windows. |
203 // 3) popup windows spawned from v1 applications. | 203 // 3) popup windows spawned from v1 applications. |
204 std::string app_name; | 204 std::string app_name; |
205 }; | 205 }; |
206 | 206 |
207 // Constructors, Creation, Showing ////////////////////////////////////////// | 207 // Constructors, Creation, Showing ////////////////////////////////////////// |
208 | 208 |
209 explicit Browser(const CreateParams& params); | 209 explicit Browser(const CreateParams& params); |
210 virtual ~Browser(); | 210 ~Browser() override; |
211 | 211 |
212 // Set overrides for the initial window bounds and maximized state. | 212 // Set overrides for the initial window bounds and maximized state. |
213 void set_override_bounds(const gfx::Rect& bounds) { | 213 void set_override_bounds(const gfx::Rect& bounds) { |
214 override_bounds_ = bounds; | 214 override_bounds_ = bounds; |
215 } | 215 } |
216 ui::WindowShowState initial_show_state() const { return initial_show_state_; } | 216 ui::WindowShowState initial_show_state() const { return initial_show_state_; } |
217 void set_initial_show_state(ui::WindowShowState initial_show_state) { | 217 void set_initial_show_state(ui::WindowShowState initial_show_state) { |
218 initial_show_state_ = initial_show_state; | 218 initial_show_state_ = initial_show_state; |
219 } | 219 } |
220 // Return true if the initial window bounds have been overridden. | 220 // Return true if the initial window bounds have been overridden. |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
401 | 401 |
402 // Called by chrome::Navigate() when a navigation has occurred in a tab in | 402 // Called by chrome::Navigate() when a navigation has occurred in a tab in |
403 // this Browser. Updates the UI for the start of this navigation. | 403 // this Browser. Updates the UI for the start of this navigation. |
404 void UpdateUIForNavigationInTab(content::WebContents* contents, | 404 void UpdateUIForNavigationInTab(content::WebContents* contents, |
405 ui::PageTransition transition, | 405 ui::PageTransition transition, |
406 bool user_initiated); | 406 bool user_initiated); |
407 | 407 |
408 // Interface implementations //////////////////////////////////////////////// | 408 // Interface implementations //////////////////////////////////////////////// |
409 | 409 |
410 // Overridden from content::PageNavigator: | 410 // Overridden from content::PageNavigator: |
411 virtual content::WebContents* OpenURL( | 411 content::WebContents* OpenURL(const content::OpenURLParams& params) override; |
412 const content::OpenURLParams& params) override; | |
413 | 412 |
414 // Overridden from TabStripModelObserver: | 413 // Overridden from TabStripModelObserver: |
415 virtual void TabInsertedAt(content::WebContents* contents, | 414 void TabInsertedAt(content::WebContents* contents, |
416 int index, | 415 int index, |
417 bool foreground) override; | 416 bool foreground) override; |
418 virtual void TabClosingAt(TabStripModel* tab_strip_model, | 417 void TabClosingAt(TabStripModel* tab_strip_model, |
419 content::WebContents* contents, | 418 content::WebContents* contents, |
420 int index) override; | 419 int index) override; |
421 virtual void TabDetachedAt(content::WebContents* contents, | 420 void TabDetachedAt(content::WebContents* contents, int index) override; |
| 421 void TabDeactivated(content::WebContents* contents) override; |
| 422 void ActiveTabChanged(content::WebContents* old_contents, |
| 423 content::WebContents* new_contents, |
| 424 int index, |
| 425 int reason) override; |
| 426 void TabMoved(content::WebContents* contents, |
| 427 int from_index, |
| 428 int to_index) override; |
| 429 void TabReplacedAt(TabStripModel* tab_strip_model, |
| 430 content::WebContents* old_contents, |
| 431 content::WebContents* new_contents, |
| 432 int index) override; |
| 433 void TabPinnedStateChanged(content::WebContents* contents, |
422 int index) override; | 434 int index) override; |
423 virtual void TabDeactivated(content::WebContents* contents) override; | 435 void TabStripEmpty() override; |
424 virtual void ActiveTabChanged(content::WebContents* old_contents, | |
425 content::WebContents* new_contents, | |
426 int index, | |
427 int reason) override; | |
428 virtual void TabMoved(content::WebContents* contents, | |
429 int from_index, | |
430 int to_index) override; | |
431 virtual void TabReplacedAt(TabStripModel* tab_strip_model, | |
432 content::WebContents* old_contents, | |
433 content::WebContents* new_contents, | |
434 int index) override; | |
435 virtual void TabPinnedStateChanged(content::WebContents* contents, | |
436 int index) override; | |
437 virtual void TabStripEmpty() override; | |
438 | 436 |
439 // Overridden from content::WebContentsDelegate: | 437 // Overridden from content::WebContentsDelegate: |
440 virtual bool CanOverscrollContent() const override; | 438 bool CanOverscrollContent() const override; |
441 virtual bool ShouldPreserveAbortedURLs(content::WebContents* source) override; | 439 bool ShouldPreserveAbortedURLs(content::WebContents* source) override; |
442 virtual bool PreHandleKeyboardEvent( | 440 bool PreHandleKeyboardEvent(content::WebContents* source, |
443 content::WebContents* source, | 441 const content::NativeWebKeyboardEvent& event, |
444 const content::NativeWebKeyboardEvent& event, | 442 bool* is_keyboard_shortcut) override; |
445 bool* is_keyboard_shortcut) override; | 443 void HandleKeyboardEvent( |
446 virtual void HandleKeyboardEvent( | |
447 content::WebContents* source, | 444 content::WebContents* source, |
448 const content::NativeWebKeyboardEvent& event) override; | 445 const content::NativeWebKeyboardEvent& event) override; |
449 virtual void OverscrollUpdate(float delta_y) override; | 446 void OverscrollUpdate(float delta_y) override; |
450 virtual void ShowValidationMessage(content::WebContents* web_contents, | 447 void ShowValidationMessage(content::WebContents* web_contents, |
451 const gfx::Rect& anchor_in_root_view, | 448 const gfx::Rect& anchor_in_root_view, |
452 const base::string16& main_text, | 449 const base::string16& main_text, |
453 const base::string16& sub_text) override; | 450 const base::string16& sub_text) override; |
454 virtual void HideValidationMessage( | 451 void HideValidationMessage(content::WebContents* web_contents) override; |
455 content::WebContents* web_contents) override; | 452 void MoveValidationMessage(content::WebContents* web_contents, |
456 virtual void MoveValidationMessage( | 453 const gfx::Rect& anchor_in_root_view) override; |
457 content::WebContents* web_contents, | 454 bool PreHandleGestureEvent(content::WebContents* source, |
458 const gfx::Rect& anchor_in_root_view) override; | 455 const blink::WebGestureEvent& event) override; |
459 virtual bool PreHandleGestureEvent( | 456 bool CanDragEnter(content::WebContents* source, |
460 content::WebContents* source, | 457 const content::DropData& data, |
461 const blink::WebGestureEvent& event) override; | 458 blink::WebDragOperationsMask operations_allowed) override; |
462 virtual bool CanDragEnter( | |
463 content::WebContents* source, | |
464 const content::DropData& data, | |
465 blink::WebDragOperationsMask operations_allowed) override; | |
466 | 459 |
467 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } | 460 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } |
468 bool is_type_popup() const { return type_ == TYPE_POPUP; } | 461 bool is_type_popup() const { return type_ == TYPE_POPUP; } |
469 | 462 |
470 bool is_app() const; | 463 bool is_app() const; |
471 bool is_devtools() const; | 464 bool is_devtools() const; |
472 | 465 |
473 // True when the mouse cursor is locked. | 466 // True when the mouse cursor is locked. |
474 bool IsMouseLocked() const; | 467 bool IsMouseLocked() const; |
475 | 468 |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
539 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE, | 532 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE, |
540 | 533 |
541 // Change is the result of a state change in the active tab. | 534 // Change is the result of a state change in the active tab. |
542 BOOKMARK_BAR_STATE_CHANGE_TAB_STATE, | 535 BOOKMARK_BAR_STATE_CHANGE_TAB_STATE, |
543 | 536 |
544 // Change is the result of window toggling in/out of fullscreen mode. | 537 // Change is the result of window toggling in/out of fullscreen mode. |
545 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, | 538 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, |
546 }; | 539 }; |
547 | 540 |
548 // Overridden from content::WebContentsDelegate: | 541 // Overridden from content::WebContentsDelegate: |
549 virtual content::WebContents* OpenURLFromTab( | 542 content::WebContents* OpenURLFromTab( |
550 content::WebContents* source, | 543 content::WebContents* source, |
551 const content::OpenURLParams& params) override; | 544 const content::OpenURLParams& params) override; |
552 virtual void NavigationStateChanged( | 545 void NavigationStateChanged(const content::WebContents* source, |
553 const content::WebContents* source, | 546 content::InvalidateTypes changed_flags) override; |
554 content::InvalidateTypes changed_flags) override; | 547 void VisibleSSLStateChanged(const content::WebContents* source) override; |
555 virtual void VisibleSSLStateChanged( | 548 void AddNewContents(content::WebContents* source, |
556 const content::WebContents* source) override; | 549 content::WebContents* new_contents, |
557 virtual void AddNewContents(content::WebContents* source, | 550 WindowOpenDisposition disposition, |
558 content::WebContents* new_contents, | 551 const gfx::Rect& initial_pos, |
559 WindowOpenDisposition disposition, | 552 bool user_gesture, |
560 const gfx::Rect& initial_pos, | 553 bool* was_blocked) override; |
561 bool user_gesture, | 554 void ActivateContents(content::WebContents* contents) override; |
562 bool* was_blocked) override; | 555 void DeactivateContents(content::WebContents* contents) override; |
563 virtual void ActivateContents(content::WebContents* contents) override; | 556 void LoadingStateChanged(content::WebContents* source, |
564 virtual void DeactivateContents(content::WebContents* contents) override; | 557 bool to_different_document) override; |
565 virtual void LoadingStateChanged(content::WebContents* source, | 558 void CloseContents(content::WebContents* source) override; |
566 bool to_different_document) override; | 559 void MoveContents(content::WebContents* source, |
567 virtual void CloseContents(content::WebContents* source) override; | 560 const gfx::Rect& pos) override; |
568 virtual void MoveContents(content::WebContents* source, | 561 bool IsPopupOrPanel(const content::WebContents* source) const override; |
569 const gfx::Rect& pos) override; | 562 void UpdateTargetURL(content::WebContents* source, const GURL& url) override; |
570 virtual bool IsPopupOrPanel( | 563 void ContentsMouseEvent(content::WebContents* source, |
571 const content::WebContents* source) const override; | 564 const gfx::Point& location, |
572 virtual void UpdateTargetURL(content::WebContents* source, | 565 bool motion) override; |
573 const GURL& url) override; | 566 void ContentsZoomChange(bool zoom_in) override; |
574 virtual void ContentsMouseEvent(content::WebContents* source, | 567 void WebContentsFocused(content::WebContents* content) override; |
575 const gfx::Point& location, | 568 bool TakeFocus(content::WebContents* source, bool reverse) override; |
576 bool motion) override; | 569 gfx::Rect GetRootWindowResizerRect() const override; |
577 virtual void ContentsZoomChange(bool zoom_in) override; | 570 void BeforeUnloadFired(content::WebContents* source, |
578 virtual void WebContentsFocused(content::WebContents* content) override; | 571 bool proceed, |
579 virtual bool TakeFocus(content::WebContents* source, bool reverse) override; | 572 bool* proceed_to_fire_unload) override; |
580 virtual gfx::Rect GetRootWindowResizerRect() const override; | 573 bool ShouldFocusLocationBarByDefault(content::WebContents* source) override; |
581 virtual void BeforeUnloadFired(content::WebContents* source, | 574 void SetFocusToLocationBar(bool select_all) override; |
582 bool proceed, | 575 int GetExtraRenderViewHeight() const override; |
583 bool* proceed_to_fire_unload) override; | 576 void ViewSourceForTab(content::WebContents* source, |
584 virtual bool ShouldFocusLocationBarByDefault( | 577 const GURL& page_url) override; |
585 content::WebContents* source) override; | 578 void ViewSourceForFrame(content::WebContents* source, |
586 virtual void SetFocusToLocationBar(bool select_all) override; | 579 const GURL& frame_url, |
587 virtual int GetExtraRenderViewHeight() const override; | 580 const content::PageState& frame_page_state) override; |
588 virtual void ViewSourceForTab(content::WebContents* source, | 581 void ShowRepostFormWarningDialog(content::WebContents* source) override; |
589 const GURL& page_url) override; | 582 bool ShouldCreateWebContents( |
590 virtual void ViewSourceForFrame( | |
591 content::WebContents* source, | |
592 const GURL& frame_url, | |
593 const content::PageState& frame_page_state) override; | |
594 virtual void ShowRepostFormWarningDialog( | |
595 content::WebContents* source) override; | |
596 virtual bool ShouldCreateWebContents( | |
597 content::WebContents* web_contents, | 583 content::WebContents* web_contents, |
598 int route_id, | 584 int route_id, |
599 WindowContainerType window_container_type, | 585 WindowContainerType window_container_type, |
600 const base::string16& frame_name, | 586 const base::string16& frame_name, |
601 const GURL& target_url, | 587 const GURL& target_url, |
602 const std::string& partition_id, | 588 const std::string& partition_id, |
603 content::SessionStorageNamespace* session_storage_namespace) override; | 589 content::SessionStorageNamespace* session_storage_namespace) override; |
604 virtual void WebContentsCreated(content::WebContents* source_contents, | 590 void WebContentsCreated(content::WebContents* source_contents, |
605 int opener_render_frame_id, | 591 int opener_render_frame_id, |
606 const base::string16& frame_name, | 592 const base::string16& frame_name, |
607 const GURL& target_url, | 593 const GURL& target_url, |
608 content::WebContents* new_contents) override; | 594 content::WebContents* new_contents) override; |
609 virtual void RendererUnresponsive(content::WebContents* source) override; | 595 void RendererUnresponsive(content::WebContents* source) override; |
610 virtual void RendererResponsive(content::WebContents* source) override; | 596 void RendererResponsive(content::WebContents* source) override; |
611 virtual void WorkerCrashed(content::WebContents* source) override; | 597 void WorkerCrashed(content::WebContents* source) override; |
612 virtual void DidNavigateMainFramePostCommit( | 598 void DidNavigateMainFramePostCommit( |
613 content::WebContents* web_contents) override; | 599 content::WebContents* web_contents) override; |
614 virtual void DidNavigateToPendingEntry( | 600 void DidNavigateToPendingEntry(content::WebContents* web_contents) override; |
615 content::WebContents* web_contents) override; | 601 content::JavaScriptDialogManager* GetJavaScriptDialogManager() override; |
616 virtual content::JavaScriptDialogManager* | 602 content::ColorChooser* OpenColorChooser( |
617 GetJavaScriptDialogManager() override; | |
618 virtual content::ColorChooser* OpenColorChooser( | |
619 content::WebContents* web_contents, | 603 content::WebContents* web_contents, |
620 SkColor color, | 604 SkColor color, |
621 const std::vector<content::ColorSuggestion>& suggestions) override; | 605 const std::vector<content::ColorSuggestion>& suggestions) override; |
622 virtual void RunFileChooser( | 606 void RunFileChooser(content::WebContents* web_contents, |
623 content::WebContents* web_contents, | 607 const content::FileChooserParams& params) override; |
624 const content::FileChooserParams& params) override; | 608 void EnumerateDirectory(content::WebContents* web_contents, |
625 virtual void EnumerateDirectory(content::WebContents* web_contents, | 609 int request_id, |
626 int request_id, | 610 const base::FilePath& path) override; |
627 const base::FilePath& path) override; | 611 bool EmbedsFullscreenWidget() const override; |
628 virtual bool EmbedsFullscreenWidget() const override; | 612 void ToggleFullscreenModeForTab(content::WebContents* web_contents, |
629 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, | 613 bool enter_fullscreen) override; |
630 bool enter_fullscreen) override; | 614 bool IsFullscreenForTabOrPending( |
631 virtual bool IsFullscreenForTabOrPending( | |
632 const content::WebContents* web_contents) const override; | 615 const content::WebContents* web_contents) const override; |
633 virtual void RegisterProtocolHandler(content::WebContents* web_contents, | 616 void RegisterProtocolHandler(content::WebContents* web_contents, |
634 const std::string& protocol, | 617 const std::string& protocol, |
635 const GURL& url, | 618 const GURL& url, |
636 bool user_gesture) override; | 619 bool user_gesture) override; |
637 virtual void UnregisterProtocolHandler(content::WebContents* web_contents, | 620 void UnregisterProtocolHandler(content::WebContents* web_contents, |
638 const std::string& protocol, | 621 const std::string& protocol, |
639 const GURL& url, | 622 const GURL& url, |
640 bool user_gesture) override; | 623 bool user_gesture) override; |
641 virtual void UpdatePreferredSize(content::WebContents* source, | 624 void UpdatePreferredSize(content::WebContents* source, |
642 const gfx::Size& pref_size) override; | 625 const gfx::Size& pref_size) override; |
643 virtual void ResizeDueToAutoResize(content::WebContents* source, | 626 void ResizeDueToAutoResize(content::WebContents* source, |
644 const gfx::Size& new_size) override; | 627 const gfx::Size& new_size) override; |
645 virtual void FindReply(content::WebContents* web_contents, | 628 void FindReply(content::WebContents* web_contents, |
646 int request_id, | 629 int request_id, |
647 int number_of_matches, | 630 int number_of_matches, |
648 const gfx::Rect& selection_rect, | 631 const gfx::Rect& selection_rect, |
649 int active_match_ordinal, | 632 int active_match_ordinal, |
650 bool final_update) override; | 633 bool final_update) override; |
651 virtual void RequestToLockMouse(content::WebContents* web_contents, | 634 void RequestToLockMouse(content::WebContents* web_contents, |
652 bool user_gesture, | 635 bool user_gesture, |
653 bool last_unlocked_by_target) override; | 636 bool last_unlocked_by_target) override; |
654 virtual void LostMouseLock() override; | 637 void LostMouseLock() override; |
655 virtual void RequestMediaAccessPermission( | 638 void RequestMediaAccessPermission( |
656 content::WebContents* web_contents, | 639 content::WebContents* web_contents, |
657 const content::MediaStreamRequest& request, | 640 const content::MediaStreamRequest& request, |
658 const content::MediaResponseCallback& callback) override; | 641 const content::MediaResponseCallback& callback) override; |
659 virtual bool CheckMediaAccessPermission( | 642 bool CheckMediaAccessPermission(content::WebContents* web_contents, |
660 content::WebContents* web_contents, | 643 const GURL& security_origin, |
661 const GURL& security_origin, | 644 content::MediaStreamType type) override; |
662 content::MediaStreamType type) override; | 645 bool RequestPpapiBrokerPermission( |
663 virtual bool RequestPpapiBrokerPermission( | |
664 content::WebContents* web_contents, | 646 content::WebContents* web_contents, |
665 const GURL& url, | 647 const GURL& url, |
666 const base::FilePath& plugin_path, | 648 const base::FilePath& plugin_path, |
667 const base::Callback<void(bool)>& callback) override; | 649 const base::Callback<void(bool)>& callback) override; |
668 virtual gfx::Size GetSizeForNewRenderView( | 650 gfx::Size GetSizeForNewRenderView( |
669 content::WebContents* web_contents) const override; | 651 content::WebContents* web_contents) const override; |
670 | 652 |
671 // Overridden from CoreTabHelperDelegate: | 653 // Overridden from CoreTabHelperDelegate: |
672 // Note that the caller is responsible for deleting |old_contents|. | 654 // Note that the caller is responsible for deleting |old_contents|. |
673 virtual void SwapTabContents(content::WebContents* old_contents, | 655 void SwapTabContents(content::WebContents* old_contents, |
674 content::WebContents* new_contents, | 656 content::WebContents* new_contents, |
675 bool did_start_load, | 657 bool did_start_load, |
676 bool did_finish_load) override; | 658 bool did_finish_load) override; |
677 virtual bool CanReloadContents( | 659 bool CanReloadContents(content::WebContents* web_contents) const override; |
678 content::WebContents* web_contents) const override; | 660 bool CanSaveContents(content::WebContents* web_contents) const override; |
679 virtual bool CanSaveContents( | |
680 content::WebContents* web_contents) const override; | |
681 | 661 |
682 // Overridden from SearchEngineTabHelperDelegate: | 662 // Overridden from SearchEngineTabHelperDelegate: |
683 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, | 663 void ConfirmAddSearchProvider(TemplateURL* template_url, |
684 Profile* profile) override; | 664 Profile* profile) override; |
685 | 665 |
686 // Overridden from SearchTabHelperDelegate: | 666 // Overridden from SearchTabHelperDelegate: |
687 virtual void NavigateOnThumbnailClick( | 667 void NavigateOnThumbnailClick(const GURL& url, |
688 const GURL& url, | 668 WindowOpenDisposition disposition, |
689 WindowOpenDisposition disposition, | 669 content::WebContents* source_contents) override; |
690 content::WebContents* source_contents) override; | 670 void OnWebContentsInstantSupportDisabled( |
691 virtual void OnWebContentsInstantSupportDisabled( | |
692 const content::WebContents* web_contents) override; | 671 const content::WebContents* web_contents) override; |
693 virtual OmniboxView* GetOmniboxView() override; | 672 OmniboxView* GetOmniboxView() override; |
694 virtual std::set<std::string> GetOpenUrls() override; | 673 std::set<std::string> GetOpenUrls() override; |
695 | 674 |
696 // Overridden from WebContentsModalDialogManagerDelegate: | 675 // Overridden from WebContentsModalDialogManagerDelegate: |
697 virtual void SetWebContentsBlocked(content::WebContents* web_contents, | 676 void SetWebContentsBlocked(content::WebContents* web_contents, |
698 bool blocked) override; | 677 bool blocked) override; |
699 virtual web_modal::WebContentsModalDialogHost* | 678 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() |
700 GetWebContentsModalDialogHost() override; | 679 override; |
701 | 680 |
702 // Overridden from BookmarkTabHelperDelegate: | 681 // Overridden from BookmarkTabHelperDelegate: |
703 virtual void URLStarredChanged(content::WebContents* web_contents, | 682 void URLStarredChanged(content::WebContents* web_contents, |
704 bool starred) override; | 683 bool starred) override; |
705 | 684 |
706 // Overridden from ZoomObserver: | 685 // Overridden from ZoomObserver: |
707 virtual void OnZoomChanged( | 686 void OnZoomChanged(const ZoomController::ZoomChangedEventData& data) override; |
708 const ZoomController::ZoomChangedEventData& data) override; | |
709 | 687 |
710 // Overridden from SelectFileDialog::Listener: | 688 // Overridden from SelectFileDialog::Listener: |
711 virtual void FileSelected(const base::FilePath& path, | 689 void FileSelected(const base::FilePath& path, |
712 int index, | 690 int index, |
713 void* params) override; | 691 void* params) override; |
714 virtual void FileSelectedWithExtraInfo( | 692 void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info, |
715 const ui::SelectedFileInfo& file_info, | 693 int index, |
716 int index, | 694 void* params) override; |
717 void* params) override; | |
718 | 695 |
719 // Overridden from content::NotificationObserver: | 696 // Overridden from content::NotificationObserver: |
720 virtual void Observe(int type, | 697 void Observe(int type, |
721 const content::NotificationSource& source, | 698 const content::NotificationSource& source, |
722 const content::NotificationDetails& details) override; | 699 const content::NotificationDetails& details) override; |
723 | 700 |
724 #if defined(ENABLE_EXTENSIONS) | 701 #if defined(ENABLE_EXTENSIONS) |
725 // Overridden from extensions::ExtensionRegistryObserver: | 702 // Overridden from extensions::ExtensionRegistryObserver: |
726 virtual void OnExtensionUninstalled( | 703 void OnExtensionUninstalled(content::BrowserContext* browser_context, |
727 content::BrowserContext* browser_context, | 704 const extensions::Extension* extension, |
728 const extensions::Extension* extension, | 705 extensions::UninstallReason reason) override; |
729 extensions::UninstallReason reason) override; | 706 void OnExtensionLoaded(content::BrowserContext* browser_context, |
730 virtual void OnExtensionLoaded( | 707 const extensions::Extension* extension) override; |
731 content::BrowserContext* browser_context, | 708 void OnExtensionUnloaded( |
732 const extensions::Extension* extension) override; | |
733 virtual void OnExtensionUnloaded( | |
734 content::BrowserContext* browser_context, | 709 content::BrowserContext* browser_context, |
735 const extensions::Extension* extension, | 710 const extensions::Extension* extension, |
736 extensions::UnloadedExtensionInfo::Reason reason) override; | 711 extensions::UnloadedExtensionInfo::Reason reason) override; |
737 #endif | 712 #endif |
738 | 713 |
739 // Command and state updating /////////////////////////////////////////////// | 714 // Command and state updating /////////////////////////////////////////////// |
740 | 715 |
741 // Handle changes to kDevTools preference. | 716 // Handle changes to kDevTools preference. |
742 void OnDevToolsDisabledChanged(); | 717 void OnDevToolsDisabledChanged(); |
743 | 718 |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
987 | 962 |
988 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 963 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
989 | 964 |
990 // The following factory is used to close the frame at a later time. | 965 // The following factory is used to close the frame at a later time. |
991 base::WeakPtrFactory<Browser> weak_factory_; | 966 base::WeakPtrFactory<Browser> weak_factory_; |
992 | 967 |
993 DISALLOW_COPY_AND_ASSIGN(Browser); | 968 DISALLOW_COPY_AND_ASSIGN(Browser); |
994 }; | 969 }; |
995 | 970 |
996 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 971 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |