| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 DownloadClosePreventionType OkToCloseWithInProgressDownloads( | 342 DownloadClosePreventionType OkToCloseWithInProgressDownloads( |
| 343 int* num_downloads_blocking) const; | 343 int* num_downloads_blocking) const; |
| 344 | 344 |
| 345 // External state change handling //////////////////////////////////////////// | 345 // External state change handling //////////////////////////////////////////// |
| 346 | 346 |
| 347 // Invoked when the fullscreen state of the window changes. | 347 // Invoked when the fullscreen state of the window changes. |
| 348 // BrowserWindow::EnterFullscreen invokes this after the window has become | 348 // BrowserWindow::EnterFullscreen invokes this after the window has become |
| 349 // fullscreen. | 349 // fullscreen. |
| 350 void WindowFullscreenStateChanged(); | 350 void WindowFullscreenStateChanged(); |
| 351 | 351 |
| 352 // Invoked when visible SSL state (as defined by SSLStatus) changes. | |
| 353 void VisibleSSLStateChanged(content::WebContents* web_contents); | |
| 354 | |
| 355 // Assorted browser commands //////////////////////////////////////////////// | 352 // Assorted browser commands //////////////////////////////////////////////// |
| 356 | 353 |
| 357 // NOTE: Within each of the following sections, the IDs are ordered roughly by | 354 // NOTE: Within each of the following sections, the IDs are ordered roughly by |
| 358 // how they appear in the GUI/menus (left to right, top to bottom, etc.). | 355 // how they appear in the GUI/menus (left to right, top to bottom, etc.). |
| 359 | 356 |
| 360 // See the description of | 357 // See the description of |
| 361 // FullscreenController::ToggleFullscreenModeWithExtension. | 358 // FullscreenController::ToggleFullscreenModeWithExtension. |
| 362 void ToggleFullscreenModeWithExtension(const GURL& extension_url); | 359 void ToggleFullscreenModeWithExtension(const GURL& extension_url); |
| 363 | 360 |
| 364 #if defined(OS_WIN) | 361 #if defined(OS_WIN) |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 // Change is the result of window toggling in/out of fullscreen mode. | 527 // Change is the result of window toggling in/out of fullscreen mode. |
| 531 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, | 528 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, |
| 532 }; | 529 }; |
| 533 | 530 |
| 534 // Overridden from content::WebContentsDelegate: | 531 // Overridden from content::WebContentsDelegate: |
| 535 virtual content::WebContents* OpenURLFromTab( | 532 virtual content::WebContents* OpenURLFromTab( |
| 536 content::WebContents* source, | 533 content::WebContents* source, |
| 537 const content::OpenURLParams& params) OVERRIDE; | 534 const content::OpenURLParams& params) OVERRIDE; |
| 538 virtual void NavigationStateChanged(const content::WebContents* source, | 535 virtual void NavigationStateChanged(const content::WebContents* source, |
| 539 unsigned changed_flags) OVERRIDE; | 536 unsigned changed_flags) OVERRIDE; |
| 537 virtual void VisibleSSLStateChanged( |
| 538 const content::WebContents* source) OVERRIDE; |
| 540 virtual void AddNewContents(content::WebContents* source, | 539 virtual void AddNewContents(content::WebContents* source, |
| 541 content::WebContents* new_contents, | 540 content::WebContents* new_contents, |
| 542 WindowOpenDisposition disposition, | 541 WindowOpenDisposition disposition, |
| 543 const gfx::Rect& initial_pos, | 542 const gfx::Rect& initial_pos, |
| 544 bool user_gesture, | 543 bool user_gesture, |
| 545 bool* was_blocked) OVERRIDE; | 544 bool* was_blocked) OVERRIDE; |
| 546 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; | 545 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; |
| 547 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; | 546 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; |
| 548 virtual void LoadingStateChanged(content::WebContents* source, | 547 virtual void LoadingStateChanged(content::WebContents* source, |
| 549 bool to_different_document) OVERRIDE; | 548 bool to_different_document) OVERRIDE; |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 936 base::WeakPtrFactory<Browser> weak_factory_; | 935 base::WeakPtrFactory<Browser> weak_factory_; |
| 937 | 936 |
| 938 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; | 937 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; |
| 939 | 938 |
| 940 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 939 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
| 941 | 940 |
| 942 DISALLOW_COPY_AND_ASSIGN(Browser); | 941 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 943 }; | 942 }; |
| 944 | 943 |
| 945 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 944 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |