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

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

Issue 10933085: Update ConstrainedWindowViews appearance according to mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Browser test fixes Created 8 years, 2 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 | « no previous file | chrome/browser/ui/browser.cc » ('j') | ui/views/controls/button/text_button.cc » ('J')
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 643 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 virtual bool CanSaveContents( 654 virtual bool CanSaveContents(
655 content::WebContents* web_contents) const OVERRIDE; 655 content::WebContents* web_contents) const OVERRIDE;
656 656
657 // Overridden from SearchEngineTabHelperDelegate: 657 // Overridden from SearchEngineTabHelperDelegate:
658 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 658 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
659 Profile* profile) OVERRIDE; 659 Profile* profile) OVERRIDE;
660 660
661 // Overridden from ConstrainedWindowTabHelperDelegate: 661 // Overridden from ConstrainedWindowTabHelperDelegate:
662 virtual void SetTabContentBlocked(content::WebContents* web_contents, 662 virtual void SetTabContentBlocked(content::WebContents* web_contents,
663 bool blocked) OVERRIDE; 663 bool blocked) OVERRIDE;
664 virtual BrowserWindow* GetBrowserWindow() OVERRIDE;
664 665
665 // Overridden from BlockedContentTabHelperDelegate: 666 // Overridden from BlockedContentTabHelperDelegate:
666 virtual content::WebContents* GetConstrainingWebContents( 667 virtual content::WebContents* GetConstrainingWebContents(
667 content::WebContents* source) OVERRIDE; 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:
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 bool window_has_shown_; 939 bool window_has_shown_;
939 940
940 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 941 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
941 // before DidEndColorChooser is called. 942 // before DidEndColorChooser is called.
942 scoped_ptr<content::ColorChooser> color_chooser_; 943 scoped_ptr<content::ColorChooser> color_chooser_;
943 944
944 DISALLOW_COPY_AND_ASSIGN(Browser); 945 DISALLOW_COPY_AND_ASSIGN(Browser);
945 }; 946 };
946 947
947 #endif // CHROME_BROWSER_UI_BROWSER_H_ 948 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | ui/views/controls/button/text_button.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698