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

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

Issue 10368027: Remove Aero Peek Tabs code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 8 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
« no previous file with comments | « chrome/browser/aeropeek_manager.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 class Extension; 44 class Extension;
45 class FullscreenExitBubbleViews; 45 class FullscreenExitBubbleViews;
46 class InfoBarContainerView; 46 class InfoBarContainerView;
47 class LocationBarView; 47 class LocationBarView;
48 class StatusBubbleViews; 48 class StatusBubbleViews;
49 class TabStrip; 49 class TabStrip;
50 class TabStripModel; 50 class TabStripModel;
51 class ToolbarView; 51 class ToolbarView;
52 52
53 #if defined(OS_WIN) 53 #if defined(OS_WIN)
54 class AeroPeekManager;
55 class JumpList; 54 class JumpList;
56 #endif 55 #endif
57 56
58 #if defined(USE_AURA) 57 #if defined(USE_AURA)
59 class BrowserLauncherItemController; 58 class BrowserLauncherItemController;
60 #endif 59 #endif
61 60
62 namespace views { 61 namespace views {
63 class AccessiblePaneView; 62 class AccessiblePaneView;
64 class ExternalFocusTracker; 63 class ExternalFocusTracker;
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 // object is also passed as a tick handler with the ticker_ object. 642 // object is also passed as a tick handler with the ticker_ object.
644 // It is used to periodically monitor for hung plugin windows 643 // It is used to periodically monitor for hung plugin windows
645 HungWindowDetector hung_window_detector_; 644 HungWindowDetector hung_window_detector_;
646 645
647 // This object is invoked by hung_window_detector_ when it detects a hung 646 // This object is invoked by hung_window_detector_ when it detects a hung
648 // plugin window. 647 // plugin window.
649 HungPluginAction hung_plugin_action_; 648 HungPluginAction hung_plugin_action_;
650 649
651 // The custom JumpList for Windows 7. 650 // The custom JumpList for Windows 7.
652 scoped_refptr<JumpList> jumplist_; 651 scoped_refptr<JumpList> jumplist_;
653
654 // The custom AeroPeek manager for Windows 7.
655 scoped_ptr<AeroPeekManager> aeropeek_manager_;
656 #endif 652 #endif
657 653
658 #if defined(USE_ASH) 654 #if defined(USE_ASH)
659 scoped_ptr<BrowserLauncherItemController> launcher_item_controller_; 655 scoped_ptr<BrowserLauncherItemController> launcher_item_controller_;
660 #endif 656 #endif
661 657
662 // The timer used to update frames for the Loading Animation. 658 // The timer used to update frames for the Loading Animation.
663 base::RepeatingTimer<BrowserView> loading_animation_timer_; 659 base::RepeatingTimer<BrowserView> loading_animation_timer_;
664 660
665 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; 661 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
666 662
667 // Used to measure the loading spinner animation rate. 663 // Used to measure the loading spinner animation rate.
668 base::TimeTicks last_animation_time_; 664 base::TimeTicks last_animation_time_;
669 665
670 // If this flag is set then SetFocusToLocationBar() will set focus to the 666 // If this flag is set then SetFocusToLocationBar() will set focus to the
671 // location bar even if the browser window is not active. 667 // location bar even if the browser window is not active.
672 bool force_location_bar_focus_; 668 bool force_location_bar_focus_;
673 669
674 PendingFullscreenRequest fullscreen_request_; 670 PendingFullscreenRequest fullscreen_request_;
675 671
676 gfx::ScopedSysColorChangeListener color_change_listener_; 672 gfx::ScopedSysColorChangeListener color_change_listener_;
677 673
678 DISALLOW_COPY_AND_ASSIGN(BrowserView); 674 DISALLOW_COPY_AND_ASSIGN(BrowserView);
679 }; 675 };
680 676
681 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 677 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/aeropeek_manager.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698