| OLD | NEW | 
|---|
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "base/basictypes.h" | 8 #include "base/basictypes.h" | 
| 9 | 9 | 
| 10 #include <set> | 10 #include <set> | 
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 238   void CloseWindow(); | 238   void CloseWindow(); | 
| 239   void NewTab(); | 239   void NewTab(); | 
| 240   void CloseTab(); | 240   void CloseTab(); | 
| 241   void SelectNextTab(); | 241   void SelectNextTab(); | 
| 242   void SelectPreviousTab(); | 242   void SelectPreviousTab(); | 
| 243   void SelectNumberedTab(int index); | 243   void SelectNumberedTab(int index); | 
| 244   void SelectLastTab(); | 244   void SelectLastTab(); | 
| 245   void DuplicateTab(); | 245   void DuplicateTab(); | 
| 246   void RestoreTab(); | 246   void RestoreTab(); | 
| 247   void ConvertPopupToTabbedBrowser(); | 247   void ConvertPopupToTabbedBrowser(); | 
|  | 248   void ToggleFullscreenMode(); | 
| 248   void Exit(); | 249   void Exit(); | 
| 249 | 250 | 
| 250   // Page-related commands | 251   // Page-related commands | 
| 251   void BookmarkCurrentPage(); | 252   void BookmarkCurrentPage(); | 
| 252   void ViewSource(); | 253   void ViewSource(); | 
| 253 #if defined(OS_WIN) | 254 #if defined(OS_WIN) | 
| 254   void ClosePopups(); | 255   void ClosePopups(); | 
| 255   void Print(); | 256   void Print(); | 
| 256   void SavePage(); | 257   void SavePage(); | 
| 257   void ToggleEncodingAutoDetect(); | 258   void ToggleEncodingAutoDetect(); | 
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 405   virtual void Observe(NotificationType type, | 406   virtual void Observe(NotificationType type, | 
| 406                        const NotificationSource& source, | 407                        const NotificationSource& source, | 
| 407                        const NotificationDetails& details); | 408                        const NotificationDetails& details); | 
| 408 | 409 | 
| 409  private: | 410  private: | 
| 410   // Command and state updating /////////////////////////////////////////////// | 411   // Command and state updating /////////////////////////////////////////////// | 
| 411 | 412 | 
| 412   // Initialize state for all browser commands. | 413   // Initialize state for all browser commands. | 
| 413   void InitCommandState(); | 414   void InitCommandState(); | 
| 414 | 415 | 
| 415   // Update commands which may be enabled or disabled depending on the tab's | 416   // Update commands whose state depends on the tab's state. | 
| 416   // state. |  | 
| 417   void UpdateCommandsForTabState(); | 417   void UpdateCommandsForTabState(); | 
| 418 | 418 | 
|  | 419   // Update commands whose state depends on whether the window is in fullscreen | 
|  | 420   // mode. | 
|  | 421   void UpdateCommandsForFullscreenMode(bool is_fullscreen); | 
|  | 422 | 
| 419   // Set the correct stop/go icon and update the Go and Stop command states. | 423   // Set the correct stop/go icon and update the Go and Stop command states. | 
| 420   // |is_loading| is true if the current TabContents is loading. | 424   // |is_loading| is true if the current TabContents is loading. | 
| 421   void UpdateStopGoState(bool is_loading); | 425   void UpdateStopGoState(bool is_loading); | 
| 422 | 426 | 
| 423   // UI update coalescing and handling //////////////////////////////////////// | 427   // UI update coalescing and handling //////////////////////////////////////// | 
| 424 | 428 | 
| 425   // Asks the toolbar (and as such the location bar) to update its state to | 429   // Asks the toolbar (and as such the location bar) to update its state to | 
| 426   // reflect the current tab's current URL, security state, etc. | 430   // reflect the current tab's current URL, security state, etc. | 
| 427   // If |should_restore_state| is true, we're switching (back?) to this tab and | 431   // If |should_restore_state| is true, we're switching (back?) to this tab and | 
| 428   // should restore any previous location bar state (such as user editing) as | 432   // should restore any previous location bar state (such as user editing) as | 
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 632   // The browser idle task helps cleanup unused memory resources when idle. | 636   // The browser idle task helps cleanup unused memory resources when idle. | 
| 633   scoped_ptr<BrowserIdleTimer> idle_task_; | 637   scoped_ptr<BrowserIdleTimer> idle_task_; | 
| 634 | 638 | 
| 635   // Keep track of the encoding auto detect pref. | 639   // Keep track of the encoding auto detect pref. | 
| 636   BooleanPrefMember encoding_auto_detect_; | 640   BooleanPrefMember encoding_auto_detect_; | 
| 637 | 641 | 
| 638   DISALLOW_COPY_AND_ASSIGN(Browser); | 642   DISALLOW_COPY_AND_ASSIGN(Browser); | 
| 639 }; | 643 }; | 
| 640 | 644 | 
| 641 #endif  // CHROME_BROWSER_BROWSER_H_ | 645 #endif  // CHROME_BROWSER_BROWSER_H_ | 
| OLD | NEW | 
|---|