Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: chrome/browser/ui/browser.h

Issue 10868116: Pass result of blockage across content API when new tab blocked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 // Change is the result of window toggling in/out of fullscreen mode. 528 // Change is the result of window toggling in/out of fullscreen mode.
529 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, 529 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN,
530 }; 530 };
531 531
532 // Overridden from content::WebContentsDelegate: 532 // Overridden from content::WebContentsDelegate:
533 virtual content::WebContents* OpenURLFromTab( 533 virtual content::WebContents* OpenURLFromTab(
534 content::WebContents* source, 534 content::WebContents* source,
535 const content::OpenURLParams& params) OVERRIDE; 535 const content::OpenURLParams& params) OVERRIDE;
536 virtual void NavigationStateChanged(const content::WebContents* source, 536 virtual void NavigationStateChanged(const content::WebContents* source,
537 unsigned changed_flags) OVERRIDE; 537 unsigned changed_flags) OVERRIDE;
538 virtual void AddNewContents(content::WebContents* source, 538 virtual bool AddNewContents(content::WebContents* source,
539 content::WebContents* new_contents, 539 content::WebContents* new_contents,
540 WindowOpenDisposition disposition, 540 WindowOpenDisposition disposition,
541 const gfx::Rect& initial_pos, 541 const gfx::Rect& initial_pos,
542 bool user_gesture) OVERRIDE; 542 bool user_gesture) OVERRIDE;
543 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; 543 virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
544 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; 544 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
545 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; 545 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
546 virtual void CloseContents(content::WebContents* source) OVERRIDE; 546 virtual void CloseContents(content::WebContents* source) OVERRIDE;
547 virtual void MoveContents(content::WebContents* source, 547 virtual void MoveContents(content::WebContents* source,
548 const gfx::Rect& pos) OVERRIDE; 548 const gfx::Rect& pos) OVERRIDE;
(...skipping 27 matching lines...) Expand all
576 content::WebContents* source) OVERRIDE; 576 content::WebContents* source) OVERRIDE;
577 virtual bool ShouldAddNavigationToHistory( 577 virtual bool ShouldAddNavigationToHistory(
578 const history::HistoryAddPageArgs& add_page_args, 578 const history::HistoryAddPageArgs& add_page_args,
579 content::NavigationType navigation_type) OVERRIDE; 579 content::NavigationType navigation_type) OVERRIDE;
580 virtual bool ShouldCreateWebContents( 580 virtual bool ShouldCreateWebContents(
581 content::WebContents* web_contents, 581 content::WebContents* web_contents,
582 int route_id, 582 int route_id,
583 WindowContainerType window_container_type, 583 WindowContainerType window_container_type,
584 const string16& frame_name, 584 const string16& frame_name,
585 const GURL& target_url) OVERRIDE; 585 const GURL& target_url) OVERRIDE;
586 virtual void WebContentsCreated(content::WebContents* source_contents, 586 virtual bool WebContentsCreated(content::WebContents* source_contents,
587 int64 source_frame_id, 587 int64 source_frame_id,
588 const GURL& target_url, 588 const GURL& target_url,
589 content::WebContents* new_contents) OVERRIDE; 589 content::WebContents* new_contents) OVERRIDE;
590 virtual void ContentRestrictionsChanged( 590 virtual void ContentRestrictionsChanged(
591 content::WebContents* source) OVERRIDE; 591 content::WebContents* source) OVERRIDE;
592 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; 592 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
593 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; 593 virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
594 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; 594 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE;
595 virtual void DidNavigateMainFramePostCommit( 595 virtual void DidNavigateMainFramePostCommit(
596 content::WebContents* web_contents) OVERRIDE; 596 content::WebContents* web_contents) OVERRIDE;
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 bool window_has_shown_; 920 bool window_has_shown_;
921 921
922 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 922 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
923 // before DidEndColorChooser is called. 923 // before DidEndColorChooser is called.
924 scoped_ptr<content::ColorChooser> color_chooser_; 924 scoped_ptr<content::ColorChooser> color_chooser_;
925 925
926 DISALLOW_COPY_AND_ASSIGN(Browser); 926 DISALLOW_COPY_AND_ASSIGN(Browser);
927 }; 927 };
928 928
929 #endif // CHROME_BROWSER_UI_BROWSER_H_ 929 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698