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

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

Issue 6035010: chromeos: Add metrics for various accelerators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/ui/views/frame
Patch Set: fix bad merge Created 9 years, 11 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
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_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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 void set_window(BrowserWindow* window) { 184 void set_window(BrowserWindow* window) {
185 DCHECK(!window_); 185 DCHECK(!window_);
186 window_ = window; 186 window_ = window;
187 } 187 }
188 #endif 188 #endif
189 189
190 BrowserWindow* window() const { return window_; } 190 BrowserWindow* window() const { return window_; }
191 ToolbarModel* toolbar_model() { return &toolbar_model_; } 191 ToolbarModel* toolbar_model() { return &toolbar_model_; }
192 const SessionID& session_id() const { return session_id_; } 192 const SessionID& session_id() const { return session_id_; }
193 CommandUpdater* command_updater() { return &command_updater_; } 193 CommandUpdater* command_updater() { return &command_updater_; }
194 bool block_command_execution() const { return block_command_execution_; }
194 195
195 // Get the FindBarController for this browser, creating it if it does not 196 // Get the FindBarController for this browser, creating it if it does not
196 // yet exist. 197 // yet exist.
197 FindBarController* GetFindBarController(); 198 FindBarController* GetFindBarController();
198 199
199 // Returns true if a FindBarController exists for this browser. 200 // Returns true if a FindBarController exists for this browser.
200 bool HasFindBarController() const; 201 bool HasFindBarController() const;
201 202
202 // Setters ///////////////////////////////////////////////////////////////// 203 // Setters /////////////////////////////////////////////////////////////////
203 204
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
1127 // and we install ourselves as an observer. 1128 // and we install ourselves as an observer.
1128 TabRestoreService* tab_restore_service_; 1129 TabRestoreService* tab_restore_service_;
1129 1130
1130 scoped_ptr<InstantController> instant_; 1131 scoped_ptr<InstantController> instant_;
1131 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1132 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1132 1133
1133 DISALLOW_COPY_AND_ASSIGN(Browser); 1134 DISALLOW_COPY_AND_ASSIGN(Browser);
1134 }; 1135 };
1135 1136
1136 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1137 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system_key_event_listener.cc ('k') | chrome/browser/ui/views/accelerator_table_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698