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

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

Issue 294903014: [DevTools] Add toolbox web contents to show in undocked mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac fixes Created 6 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 | Annotate | Revision Log
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 <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 // The view that contains the selected WebContents. 647 // The view that contains the selected WebContents.
648 ContentsWebView* contents_web_view_; 648 ContentsWebView* contents_web_view_;
649 649
650 // The view that contains devtools window for the selected WebContents. 650 // The view that contains devtools window for the selected WebContents.
651 views::WebView* devtools_web_view_; 651 views::WebView* devtools_web_view_;
652 652
653 // The view managing the devtools and contents positions. 653 // The view managing the devtools and contents positions.
654 // Handled by ContentsLayoutManager. 654 // Handled by ContentsLayoutManager.
655 views::View* contents_container_; 655 views::View* contents_container_;
656 656
657 // Docked devtools window instance. NULL when current tab is not inspected
658 // or is inspected with undocked version of DevToolsWindow.
659 DevToolsWindow* devtools_window_;
660
661 // Tracks and stores the last focused view which is not the 657 // Tracks and stores the last focused view which is not the
662 // devtools_web_view_ or any of its children. Used to restore focus once 658 // devtools_web_view_ or any of its children. Used to restore focus once
663 // the devtools_web_view_ is hidden. 659 // the devtools_web_view_ is hidden.
664 scoped_ptr<views::ExternalFocusTracker> devtools_focus_tracker_; 660 scoped_ptr<views::ExternalFocusTracker> devtools_focus_tracker_;
665 661
666 // The Status information bubble that appears at the bottom of the window. 662 // The Status information bubble that appears at the bottom of the window.
667 scoped_ptr<StatusBubbleViews> status_bubble_; 663 scoped_ptr<StatusBubbleViews> status_bubble_;
668 664
669 // The permission bubble view is the toolkit-specific implementation of the 665 // The permission bubble view is the toolkit-specific implementation of the
670 // interface used by the manager to display permissions bubbles. 666 // interface used by the manager to display permissions bubbles.
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; 717 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_;
722 718
723 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 719 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
724 720
725 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 721 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
726 722
727 DISALLOW_COPY_AND_ASSIGN(BrowserView); 723 DISALLOW_COPY_AND_ASSIGN(BrowserView);
728 }; 724 };
729 725
730 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 726 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698