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

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

Issue 338022: Reverting 30062. (Closed) Base URL: svn://svn.chromium.org/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/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) 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 DCHECK(!window_); 127 DCHECK(!window_);
128 window_ = window; 128 window_ = window;
129 } 129 }
130 #endif 130 #endif
131 131
132 BrowserWindow* window() const { return window_; } 132 BrowserWindow* window() const { return window_; }
133 ToolbarModel* toolbar_model() { return &toolbar_model_; } 133 ToolbarModel* toolbar_model() { return &toolbar_model_; }
134 const SessionID& session_id() const { return session_id_; } 134 const SessionID& session_id() const { return session_id_; }
135 CommandUpdater* command_updater() { return &command_updater_; } 135 CommandUpdater* command_updater() { return &command_updater_; }
136 FindBarController* find_bar() { return find_bar_controller_.get(); } 136 FindBarController* find_bar() { return find_bar_controller_.get(); }
137 FindBarController* GetFindBarController();
138 ExtensionShelfModel* extension_shelf_model() { 137 ExtensionShelfModel* extension_shelf_model() {
139 return extension_shelf_model_.get(); 138 return extension_shelf_model_.get();
140 } 139 }
141 140
142 // Setters ///////////////////////////////////////////////////////////////// 141 // Setters /////////////////////////////////////////////////////////////////
143 142
144 void set_user_data_dir_profiles(const std::vector<std::wstring>& profiles); 143 void set_user_data_dir_profiles(const std::vector<std::wstring>& profiles);
145 144
146 // Browser Creation Helpers ///////////////////////////////////////////////// 145 // Browser Creation Helpers /////////////////////////////////////////////////
147 146
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 // Dialog box used for opening and saving files. 803 // Dialog box used for opening and saving files.
805 scoped_refptr<SelectFileDialog> select_file_dialog_; 804 scoped_refptr<SelectFileDialog> select_file_dialog_;
806 805
807 // Keep track of the encoding auto detect pref. 806 // Keep track of the encoding auto detect pref.
808 BooleanPrefMember encoding_auto_detect_; 807 BooleanPrefMember encoding_auto_detect_;
809 808
810 DISALLOW_COPY_AND_ASSIGN(Browser); 809 DISALLOW_COPY_AND_ASSIGN(Browser);
811 }; 810 };
812 811
813 #endif // CHROME_BROWSER_BROWSER_H_ 812 #endif // CHROME_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698