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

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

Issue 10905301: Switch CoreTabHelper 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
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 bool user_gesture, 641 bool user_gesture,
642 bool last_unlocked_by_target) OVERRIDE; 642 bool last_unlocked_by_target) OVERRIDE;
643 virtual void LostMouseLock() OVERRIDE; 643 virtual void LostMouseLock() OVERRIDE;
644 virtual void RequestMediaAccessPermission( 644 virtual void RequestMediaAccessPermission(
645 content::WebContents* web_contents, 645 content::WebContents* web_contents,
646 const content::MediaStreamRequest* request, 646 const content::MediaStreamRequest* request,
647 const content::MediaResponseCallback& callback) OVERRIDE; 647 const content::MediaResponseCallback& callback) OVERRIDE;
648 648
649 // Overridden from CoreTabHelperDelegate: 649 // Overridden from CoreTabHelperDelegate:
650 // Note that the caller is responsible for deleting |old_tab_contents|. 650 // Note that the caller is responsible for deleting |old_tab_contents|.
651 virtual void SwapTabContents(TabContents* old_tab_contents, 651 virtual void SwapTabContents(content::WebContents* old_contents,
652 TabContents* new_tab_contents) OVERRIDE; 652 content::WebContents* new_contents) OVERRIDE;
653 virtual bool CanReloadContents(TabContents* source) const OVERRIDE; 653 virtual bool CanReloadContents(
654 virtual bool CanSaveContents(TabContents* source) const OVERRIDE; 654 content::WebContents* web_contents) const OVERRIDE;
655 virtual bool CanSaveContents(
656 content::WebContents* web_contents) const OVERRIDE;
655 657
656 // Overridden from SearchEngineTabHelperDelegate: 658 // Overridden from SearchEngineTabHelperDelegate:
657 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 659 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
658 Profile* profile) OVERRIDE; 660 Profile* profile) OVERRIDE;
659 661
660 // Overridden from ConstrainedWindowTabHelperDelegate: 662 // Overridden from ConstrainedWindowTabHelperDelegate:
661 virtual void SetTabContentBlocked(TabContents* contents, 663 virtual void SetTabContentBlocked(TabContents* contents,
662 bool blocked) OVERRIDE; 664 bool blocked) OVERRIDE;
663 665
664 // Overridden from BlockedContentTabHelperDelegate: 666 // Overridden from BlockedContentTabHelperDelegate:
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 bool window_has_shown_; 934 bool window_has_shown_;
933 935
934 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 936 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
935 // before DidEndColorChooser is called. 937 // before DidEndColorChooser is called.
936 scoped_ptr<content::ColorChooser> color_chooser_; 938 scoped_ptr<content::ColorChooser> color_chooser_;
937 939
938 DISALLOW_COPY_AND_ASSIGN(Browser); 940 DISALLOW_COPY_AND_ASSIGN(Browser);
939 }; 941 };
940 942
941 #endif // CHROME_BROWSER_UI_BROWSER_H_ 943 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698