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

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

Issue 335047: Revert 30194 - Makes session restore on Chrome OS restore popups.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month 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/automation/automation_provider.cc ('k') | chrome/browser/defaults.h » ('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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 26 matching lines...) Expand all
37 class TabNavigation; 37 class TabNavigation;
38 38
39 class Browser : public TabStripModelDelegate, 39 class Browser : public TabStripModelDelegate,
40 public TabStripModelObserver, 40 public TabStripModelObserver,
41 public TabContentsDelegate, 41 public TabContentsDelegate,
42 public PageNavigator, 42 public PageNavigator,
43 public CommandUpdater::CommandUpdaterDelegate, 43 public CommandUpdater::CommandUpdaterDelegate,
44 public NotificationObserver, 44 public NotificationObserver,
45 public SelectFileDialog::Listener { 45 public SelectFileDialog::Listener {
46 public: 46 public:
47 // If you change this, update browser_proxy as well.
48 enum Type { 47 enum Type {
49 TYPE_NORMAL = 0, 48 TYPE_NORMAL = 0,
50 TYPE_POPUP = 1, 49 TYPE_POPUP = 1,
51 TYPE_APP = 2, 50 TYPE_APP = 2,
52 TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP, 51 TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP,
53 }; 52 };
54 53
55 // Possible elements of the Browser window. 54 // Possible elements of the Browser window.
56 enum WindowFeature { 55 enum WindowFeature {
57 FEATURE_TITLEBAR = 1, 56 FEATURE_TITLEBAR = 1,
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 // Dialog box used for opening and saving files. 806 // Dialog box used for opening and saving files.
808 scoped_refptr<SelectFileDialog> select_file_dialog_; 807 scoped_refptr<SelectFileDialog> select_file_dialog_;
809 808
810 // Keep track of the encoding auto detect pref. 809 // Keep track of the encoding auto detect pref.
811 BooleanPrefMember encoding_auto_detect_; 810 BooleanPrefMember encoding_auto_detect_;
812 811
813 DISALLOW_COPY_AND_ASSIGN(Browser); 812 DISALLOW_COPY_AND_ASSIGN(Browser);
814 }; 813 };
815 814
816 #endif // CHROME_BROWSER_BROWSER_H_ 815 #endif // CHROME_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/defaults.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698