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

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

Issue 3415026: Makes instant support other open dispositions. (Closed)
Patch Set: Merge and prune Created 10 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
« no previous file with comments | « no previous file | chrome/browser/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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_BROWSER_H_
6 #define CHROME_BROWSER_BROWSER_H_ 6 #define CHROME_BROWSER_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 953
954 // Determines if closing of browser can really be permitted after normal 954 // Determines if closing of browser can really be permitted after normal
955 // sequence of downloads and unload handlers have given the go-ahead to close. 955 // sequence of downloads and unload handlers have given the go-ahead to close.
956 // It is called from ShouldCloseWindow. It checks with 956 // It is called from ShouldCloseWindow. It checks with
957 // TabCloseableStateWatcher to confirm if browser can really be closed. 957 // TabCloseableStateWatcher to confirm if browser can really be closed.
958 // Appropriate action is taken by watcher as it sees fit. 958 // Appropriate action is taken by watcher as it sees fit.
959 // If watcher denies closing of browser, CancelWindowClose is called to 959 // If watcher denies closing of browser, CancelWindowClose is called to
960 // cancel closing of window. 960 // cancel closing of window.
961 bool IsClosingPermitted(); 961 bool IsClosingPermitted();
962 962
963 // Commits the current match preview, returning true on success. This is
964 // intended for use from OpenCurrentURL.
965 bool OpenMatchPreview(WindowOpenDisposition disposition);
966
963 // Data members ///////////////////////////////////////////////////////////// 967 // Data members /////////////////////////////////////////////////////////////
964 968
965 NotificationRegistrar registrar_; 969 NotificationRegistrar registrar_;
966 970
967 // This Browser's type. 971 // This Browser's type.
968 const Type type_; 972 const Type type_;
969 973
970 // This Browser's profile. 974 // This Browser's profile.
971 Profile* const profile_; 975 Profile* const profile_;
972 976
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 // The profile's tab restore service. The service is owned by the profile, 1088 // The profile's tab restore service. The service is owned by the profile,
1085 // and we install ourselves as an observer. 1089 // and we install ourselves as an observer.
1086 TabRestoreService* tab_restore_service_; 1090 TabRestoreService* tab_restore_service_;
1087 1091
1088 scoped_ptr<MatchPreview> match_preview_; 1092 scoped_ptr<MatchPreview> match_preview_;
1089 1093
1090 DISALLOW_COPY_AND_ASSIGN(Browser); 1094 DISALLOW_COPY_AND_ASSIGN(Browser);
1091 }; 1095 };
1092 1096
1093 #endif // CHROME_BROWSER_BROWSER_H_ 1097 #endif // CHROME_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698