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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 1983803002: Added notification when user presses backspace to use new shortcut. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@subtle-notification-view-refactor
Patch Set: Respond to pkasting review. Created 4 years, 7 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
OLDNEW
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>
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/ui/infobar_container_delegate.h" 24 #include "chrome/browser/ui/infobar_container_delegate.h"
25 #include "chrome/browser/ui/signin_view_controller.h" 25 #include "chrome/browser/ui/signin_view_controller.h"
26 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 26 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
27 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h" 27 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h"
28 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h" 28 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"
29 #include "chrome/browser/ui/views/frame/browser_frame.h" 29 #include "chrome/browser/ui/views/frame/browser_frame.h"
30 #include "chrome/browser/ui/views/frame/contents_web_view.h" 30 #include "chrome/browser/ui/views/frame/contents_web_view.h"
31 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 31 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
32 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" 32 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
33 #include "chrome/browser/ui/views/load_complete_listener.h" 33 #include "chrome/browser/ui/views/load_complete_listener.h"
34 #include "chrome/browser/ui/views/new_back_shortcut_bubble.h"
Peter Kasting 2016/05/24 23:35:08 Nit: I think you can just forward-declare the type
Matt Giuca 2016/05/26 04:37:35 Done.
34 #include "chrome/common/features.h" 35 #include "chrome/common/features.h"
35 #include "components/omnibox/browser/omnibox_popup_model_observer.h" 36 #include "components/omnibox/browser/omnibox_popup_model_observer.h"
36 #include "ui/base/accelerators/accelerator.h" 37 #include "ui/base/accelerators/accelerator.h"
37 #include "ui/base/models/simple_menu_model.h" 38 #include "ui/base/models/simple_menu_model.h"
38 #include "ui/gfx/native_widget_types.h" 39 #include "ui/gfx/native_widget_types.h"
39 #include "ui/views/controls/button/button.h" 40 #include "ui/views/controls/button/button.h"
40 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" 41 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
41 #include "ui/views/widget/widget_delegate.h" 42 #include "ui/views/widget/widget_delegate.h"
42 #include "ui/views/widget/widget_observer.h" 43 #include "ui/views/widget/widget_observer.h"
43 #include "ui/views/window/client_view.h" 44 #include "ui/views/window/client_view.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 ExclusiveAccessBubbleType bubble_type, 283 ExclusiveAccessBubbleType bubble_type,
283 bool with_toolbar) override; 284 bool with_toolbar) override;
284 void ExitFullscreen() override; 285 void ExitFullscreen() override;
285 void UpdateExclusiveAccessExitBubbleContent( 286 void UpdateExclusiveAccessExitBubbleContent(
286 const GURL& url, 287 const GURL& url,
287 ExclusiveAccessBubbleType bubble_type) override; 288 ExclusiveAccessBubbleType bubble_type) override;
288 void OnExclusiveAccessUserInput() override; 289 void OnExclusiveAccessUserInput() override;
289 bool ShouldHideUIForFullscreen() const override; 290 bool ShouldHideUIForFullscreen() const override;
290 bool IsFullscreen() const override; 291 bool IsFullscreen() const override;
291 bool IsFullscreenBubbleVisible() const override; 292 bool IsFullscreenBubbleVisible() const override;
293 void ShowNewBackShortcutBubble(bool forward) override;
292 LocationBar* GetLocationBar() const override; 294 LocationBar* GetLocationBar() const override;
293 void SetFocusToLocationBar(bool select_all) override; 295 void SetFocusToLocationBar(bool select_all) override;
294 void UpdateReloadStopState(bool is_loading, bool force) override; 296 void UpdateReloadStopState(bool is_loading, bool force) override;
295 void UpdateToolbar(content::WebContents* contents) override; 297 void UpdateToolbar(content::WebContents* contents) override;
296 void ResetToolbarTabState(content::WebContents* contents) override; 298 void ResetToolbarTabState(content::WebContents* contents) override;
297 void FocusToolbar() override; 299 void FocusToolbar() override;
298 ToolbarActionsBar* GetToolbarActionsBar() override; 300 ToolbarActionsBar* GetToolbarActionsBar() override;
299 void ToolbarSizeChanged(bool is_animating) override; 301 void ToolbarSizeChanged(bool is_animating) override;
300 void FocusAppMenu() override; 302 void FocusAppMenu() override;
301 void FocusBookmarksToolbar() override; 303 void FocusBookmarksToolbar() override;
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 // OnThemeChanged()). 663 // OnThemeChanged()).
662 bool handling_theme_changed_; 664 bool handling_theme_changed_;
663 665
664 // True when in ProcessFullscreen(). The flag is used to avoid reentrance and 666 // True when in ProcessFullscreen(). The flag is used to avoid reentrance and
665 // to ignore requests to layout while in ProcessFullscreen() to reduce 667 // to ignore requests to layout while in ProcessFullscreen() to reduce
666 // jankiness. 668 // jankiness.
667 bool in_process_fullscreen_; 669 bool in_process_fullscreen_;
668 670
669 std::unique_ptr<ExclusiveAccessBubbleViews> exclusive_access_bubble_; 671 std::unique_ptr<ExclusiveAccessBubbleViews> exclusive_access_bubble_;
670 672
673 std::unique_ptr<NewBackShortcutBubble> new_back_shortcut_bubble_;
674
671 #if defined(OS_WIN) 675 #if defined(OS_WIN)
672 // Helper class to listen for completion of first page load. 676 // Helper class to listen for completion of first page load.
673 std::unique_ptr<LoadCompleteListener> load_complete_listener_; 677 std::unique_ptr<LoadCompleteListener> load_complete_listener_;
674 678
675 // The custom JumpList for Windows 7. 679 // The custom JumpList for Windows 7.
676 scoped_refptr<JumpList> jumplist_; 680 scoped_refptr<JumpList> jumplist_;
677 #endif 681 #endif
678 682
679 // The timer used to update frames for the Loading Animation. 683 // The timer used to update frames for the Loading Animation.
680 base::RepeatingTimer loading_animation_timer_; 684 base::RepeatingTimer loading_animation_timer_;
(...skipping 13 matching lines...) Expand all
694 // The class that registers for keyboard shortcuts for extension commands. 698 // The class that registers for keyboard shortcuts for extension commands.
695 std::unique_ptr<ExtensionKeybindingRegistryViews> 699 std::unique_ptr<ExtensionKeybindingRegistryViews>
696 extension_keybinding_registry_; 700 extension_keybinding_registry_;
697 701
698 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 702 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
699 703
700 DISALLOW_COPY_AND_ASSIGN(BrowserView); 704 DISALLOW_COPY_AND_ASSIGN(BrowserView);
701 }; 705 };
702 706
703 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 707 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698