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

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

Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: stage changes to preserve history Created 8 years 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/ssl/ssl_browser_tests.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 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 virtual bool CanReloadContents( 674 virtual bool CanReloadContents(
675 content::WebContents* web_contents) const OVERRIDE; 675 content::WebContents* web_contents) const OVERRIDE;
676 virtual bool CanSaveContents( 676 virtual bool CanSaveContents(
677 content::WebContents* web_contents) const OVERRIDE; 677 content::WebContents* web_contents) const OVERRIDE;
678 678
679 // Overridden from SearchEngineTabHelperDelegate: 679 // Overridden from SearchEngineTabHelperDelegate:
680 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 680 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
681 Profile* profile) OVERRIDE; 681 Profile* profile) OVERRIDE;
682 682
683 // Overridden from ConstrainedWindowTabHelperDelegate: 683 // Overridden from ConstrainedWindowTabHelperDelegate:
684 virtual void SetTabContentBlocked(content::WebContents* web_contents, 684 virtual void SetWebContentsBlocked(content::WebContents* web_contents,
685 bool blocked) OVERRIDE; 685 bool blocked) OVERRIDE;
686 virtual bool GetConstrainedWindowTopCenter(gfx::Point* point) OVERRIDE; 686 virtual bool GetDialogTopCenter(gfx::Point* point) OVERRIDE;
687 687
688 // Overridden from BlockedContentTabHelperDelegate: 688 // Overridden from BlockedContentTabHelperDelegate:
689 virtual content::WebContents* GetConstrainingWebContents( 689 virtual content::WebContents* GetConstrainingWebContents(
690 content::WebContents* source) OVERRIDE; 690 content::WebContents* source) OVERRIDE;
691 691
692 // Overridden from BookmarkTabHelperDelegate: 692 // Overridden from BookmarkTabHelperDelegate:
693 virtual void URLStarredChanged(content::WebContents* web_contents, 693 virtual void URLStarredChanged(content::WebContents* web_contents,
694 bool starred) OVERRIDE; 694 bool starred) OVERRIDE;
695 695
696 // Overridden from ZoomObserver: 696 // Overridden from ZoomObserver:
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 bool window_has_shown_; 960 bool window_has_shown_;
961 961
962 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 962 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
963 // before DidEndColorChooser is called. 963 // before DidEndColorChooser is called.
964 scoped_ptr<content::ColorChooser> color_chooser_; 964 scoped_ptr<content::ColorChooser> color_chooser_;
965 965
966 DISALLOW_COPY_AND_ASSIGN(Browser); 966 DISALLOW_COPY_AND_ASSIGN(Browser);
967 }; 967 };
968 968
969 #endif // CHROME_BROWSER_UI_BROWSER_H_ 969 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698