| 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_VIEWS_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/gtest_prod_util.h" | 14 #include "base/gtest_prod_util.h" |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 #include "base/time/time.h" |
| 16 #include "base/timer/timer.h" | 17 #include "base/timer/timer.h" |
| 17 #include "build/build_config.h" | 18 #include "build/build_config.h" |
| 18 #include "chrome/browser/devtools/devtools_window.h" | 19 #include "chrome/browser/devtools/devtools_window.h" |
| 19 #include "chrome/browser/extensions/extension_commands_global_registry.h" | 20 #include "chrome/browser/extensions/extension_commands_global_registry.h" |
| 20 #include "chrome/browser/extensions/extension_keybinding_registry.h" | 21 #include "chrome/browser/extensions/extension_keybinding_registry.h" |
| 21 #include "chrome/browser/ui/browser.h" | 22 #include "chrome/browser/ui/browser.h" |
| 22 #include "chrome/browser/ui/browser_window.h" | 23 #include "chrome/browser/ui/browser_window.h" |
| 23 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" | 24 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" |
| 24 #include "chrome/browser/ui/infobar_container_delegate.h" | 25 #include "chrome/browser/ui/infobar_container_delegate.h" |
| 25 #include "chrome/browser/ui/signin_view_controller.h" | 26 #include "chrome/browser/ui/signin_view_controller.h" |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 ExclusiveAccessBubbleType bubble_type, | 284 ExclusiveAccessBubbleType bubble_type, |
| 284 bool with_toolbar) override; | 285 bool with_toolbar) override; |
| 285 void ExitFullscreen() override; | 286 void ExitFullscreen() override; |
| 286 void UpdateExclusiveAccessExitBubbleContent( | 287 void UpdateExclusiveAccessExitBubbleContent( |
| 287 const GURL& url, | 288 const GURL& url, |
| 288 ExclusiveAccessBubbleType bubble_type) override; | 289 ExclusiveAccessBubbleType bubble_type) override; |
| 289 void OnExclusiveAccessUserInput() override; | 290 void OnExclusiveAccessUserInput() override; |
| 290 bool ShouldHideUIForFullscreen() const override; | 291 bool ShouldHideUIForFullscreen() const override; |
| 291 bool IsFullscreen() const override; | 292 bool IsFullscreen() const override; |
| 292 bool IsFullscreenBubbleVisible() const override; | 293 bool IsFullscreenBubbleVisible() const override; |
| 293 void ShowNewBackShortcutBubble(bool forward) override; | 294 void MaybeShowNewBackShortcutBubble(bool forward) override; |
| 295 void HideNewBackShortcutBubble() override; |
| 294 LocationBar* GetLocationBar() const override; | 296 LocationBar* GetLocationBar() const override; |
| 295 void SetFocusToLocationBar(bool select_all) override; | 297 void SetFocusToLocationBar(bool select_all) override; |
| 296 void UpdateReloadStopState(bool is_loading, bool force) override; | 298 void UpdateReloadStopState(bool is_loading, bool force) override; |
| 297 void UpdateToolbar(content::WebContents* contents) override; | 299 void UpdateToolbar(content::WebContents* contents) override; |
| 298 void ResetToolbarTabState(content::WebContents* contents) override; | 300 void ResetToolbarTabState(content::WebContents* contents) override; |
| 299 void FocusToolbar() override; | 301 void FocusToolbar() override; |
| 300 ToolbarActionsBar* GetToolbarActionsBar() override; | 302 ToolbarActionsBar* GetToolbarActionsBar() override; |
| 301 void ToolbarSizeChanged(bool is_animating) override; | 303 void ToolbarSizeChanged(bool is_animating) override; |
| 302 void FocusAppMenu() override; | 304 void FocusAppMenu() override; |
| 303 void FocusBookmarksToolbar() override; | 305 void FocusBookmarksToolbar() override; |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 bool handling_theme_changed_; | 666 bool handling_theme_changed_; |
| 665 | 667 |
| 666 // True when in ProcessFullscreen(). The flag is used to avoid reentrance and | 668 // True when in ProcessFullscreen(). The flag is used to avoid reentrance and |
| 667 // to ignore requests to layout while in ProcessFullscreen() to reduce | 669 // to ignore requests to layout while in ProcessFullscreen() to reduce |
| 668 // jankiness. | 670 // jankiness. |
| 669 bool in_process_fullscreen_; | 671 bool in_process_fullscreen_; |
| 670 | 672 |
| 671 std::unique_ptr<ExclusiveAccessBubbleViews> exclusive_access_bubble_; | 673 std::unique_ptr<ExclusiveAccessBubbleViews> exclusive_access_bubble_; |
| 672 | 674 |
| 673 std::unique_ptr<NewBackShortcutBubble> new_back_shortcut_bubble_; | 675 std::unique_ptr<NewBackShortcutBubble> new_back_shortcut_bubble_; |
| 676 base::TimeTicks last_back_shortcut_press_time_; |
| 674 | 677 |
| 675 #if defined(OS_WIN) | 678 #if defined(OS_WIN) |
| 676 // Helper class to listen for completion of first page load. | 679 // Helper class to listen for completion of first page load. |
| 677 std::unique_ptr<LoadCompleteListener> load_complete_listener_; | 680 std::unique_ptr<LoadCompleteListener> load_complete_listener_; |
| 678 | 681 |
| 679 // The custom JumpList for Windows 7. | 682 // The custom JumpList for Windows 7. |
| 680 scoped_refptr<JumpList> jumplist_; | 683 scoped_refptr<JumpList> jumplist_; |
| 681 #endif | 684 #endif |
| 682 | 685 |
| 683 // The timer used to update frames for the Loading Animation. | 686 // The timer used to update frames for the Loading Animation. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 698 // The class that registers for keyboard shortcuts for extension commands. | 701 // The class that registers for keyboard shortcuts for extension commands. |
| 699 std::unique_ptr<ExtensionKeybindingRegistryViews> | 702 std::unique_ptr<ExtensionKeybindingRegistryViews> |
| 700 extension_keybinding_registry_; | 703 extension_keybinding_registry_; |
| 701 | 704 |
| 702 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 705 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 703 | 706 |
| 704 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 707 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 705 }; | 708 }; |
| 706 | 709 |
| 707 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 710 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |