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

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

Issue 10938033: Switch BlockedContentTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 657
658 // Overridden from SearchEngineTabHelperDelegate: 658 // Overridden from SearchEngineTabHelperDelegate:
659 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 659 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
660 Profile* profile) OVERRIDE; 660 Profile* profile) OVERRIDE;
661 661
662 // Overridden from ConstrainedWindowTabHelperDelegate: 662 // Overridden from ConstrainedWindowTabHelperDelegate:
663 virtual void SetTabContentBlocked(TabContents* contents, 663 virtual void SetTabContentBlocked(TabContents* contents,
664 bool blocked) OVERRIDE; 664 bool blocked) OVERRIDE;
665 665
666 // Overridden from BlockedContentTabHelperDelegate: 666 // Overridden from BlockedContentTabHelperDelegate:
667 virtual TabContents* GetConstrainingTabContents(TabContents* source) OVERRIDE; 667 virtual content::WebContents* GetConstrainingWebContents(
668 content::WebContents* source) OVERRIDE;
668 669
669 // Overridden from BookmarkTabHelperDelegate: 670 // Overridden from BookmarkTabHelperDelegate:
670 virtual void URLStarredChanged(content::WebContents* web_contents, 671 virtual void URLStarredChanged(content::WebContents* web_contents,
671 bool starred) OVERRIDE; 672 bool starred) OVERRIDE;
672 673
673 // Overridden from ZoomObserver: 674 // Overridden from ZoomObserver:
674 virtual void OnZoomChanged(TabContents* source, 675 virtual void OnZoomChanged(TabContents* source,
675 bool can_show_bubble) OVERRIDE; 676 bool can_show_bubble) OVERRIDE;
676 677
677 // Overridden from SelectFileDialog::Listener: 678 // Overridden from SelectFileDialog::Listener:
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 bool window_has_shown_; 935 bool window_has_shown_;
935 936
936 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 937 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
937 // before DidEndColorChooser is called. 938 // before DidEndColorChooser is called.
938 scoped_ptr<content::ColorChooser> color_chooser_; 939 scoped_ptr<content::ColorChooser> color_chooser_;
939 940
940 DISALLOW_COPY_AND_ASSIGN(Browser); 941 DISALLOW_COPY_AND_ASSIGN(Browser);
941 }; 942 };
942 943
943 #endif // CHROME_BROWSER_UI_BROWSER_H_ 944 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698