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

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

Issue 56175: Integrates a custom JumpList of Windows 7.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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/jumplist.cc ('k') | chrome/browser/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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map>
8 #include <set> 9 #include <set>
10 #include <string>
9 11
10 #include "base/gfx/native_widget_types.h" 12 #include "base/gfx/native_widget_types.h"
13 #include "base/scoped_ptr.h"
11 #include "base/timer.h" 14 #include "base/timer.h"
12 #include "build/build_config.h" 15 #include "build/build_config.h"
13 #include "chrome/browser/browser.h" 16 #include "chrome/browser/browser.h"
14 #include "chrome/browser/browser_window.h" 17 #include "chrome/browser/browser_window.h"
15 #if defined(OS_WIN) 18 #if defined(OS_WIN)
16 #include "chrome/browser/hang_monitor/hung_plugin_action.h" 19 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
17 #include "chrome/browser/hang_monitor/hung_window_detector.h" 20 #include "chrome/browser/hang_monitor/hung_window_detector.h"
18 #endif 21 #endif
19 #include "chrome/browser/tabs/tab_strip_model.h" 22 #include "chrome/browser/tabs/tab_strip_model.h"
20 #include "chrome/browser/views/frame/browser_frame.h" 23 #include "chrome/browser/views/frame/browser_frame.h"
21 #if defined(OS_WIN) 24 #if defined(OS_WIN)
22 #include "views/controls/menu/native_menu_win.h" 25 #include "views/controls/menu/native_menu_win.h"
23 #endif 26 #endif
24 #include "views/controls/menu/simple_menu_model.h" 27 #include "views/controls/menu/simple_menu_model.h"
25 #include "views/window/client_view.h" 28 #include "views/window/client_view.h"
26 #include "views/window/window_delegate.h" 29 #include "views/window/window_delegate.h"
27 30
28 // NOTE: For more information about the objects and files in this directory, 31 // NOTE: For more information about the objects and files in this directory,
29 // view: http://dev.chromium.org/developers/design-documents/browser-window 32 // view: http://dev.chromium.org/developers/design-documents/browser-window
30 33
31 class BookmarkBarView; 34 class BookmarkBarView;
32 class Browser; 35 class Browser;
33 class BrowserBubble; 36 class BrowserBubble;
34 class DownloadShelfView; 37 class DownloadShelfView;
35 class EncodingMenuModel; 38 class EncodingMenuModel;
36 class ExtensionShelf; 39 class ExtensionShelf;
37 class FullscreenExitBubble; 40 class FullscreenExitBubble;
38 class HtmlDialogUIDelegate; 41 class HtmlDialogUIDelegate;
39 class InfoBarContainer; 42 class InfoBarContainer;
43 #if defined(OS_WIN)
44 class JumpList;
45 #endif
40 class LocationBarView; 46 class LocationBarView;
41 class StatusBubbleViews; 47 class StatusBubbleViews;
42 class TabContentsContainer; 48 class TabContentsContainer;
43 class TabStripWrapper; 49 class TabStripWrapper;
44 class ToolbarView; 50 class ToolbarView;
45 class ZoomMenuModel; 51 class ZoomMenuModel;
46 52
47 namespace views { 53 namespace views {
48 class ExternalFocusTracker; 54 class ExternalFocusTracker;
49 class Menu; 55 class Menu;
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 WorkerThreadTicker ticker_; 472 WorkerThreadTicker ticker_;
467 473
468 // This object is initialized with the frame window HWND. This 474 // This object is initialized with the frame window HWND. This
469 // object is also passed as a tick handler with the ticker_ object. 475 // object is also passed as a tick handler with the ticker_ object.
470 // It is used to periodically monitor for hung plugin windows 476 // It is used to periodically monitor for hung plugin windows
471 HungWindowDetector hung_window_detector_; 477 HungWindowDetector hung_window_detector_;
472 478
473 // This object is invoked by hung_window_detector_ when it detects a hung 479 // This object is invoked by hung_window_detector_ when it detects a hung
474 // plugin window. 480 // plugin window.
475 HungPluginAction hung_plugin_action_; 481 HungPluginAction hung_plugin_action_;
482
483 // The custom JumpList for Windows 7.
484 scoped_ptr<JumpList> jumplist_;
476 #endif 485 #endif
477 486
478 // The timer used to update frames for the Loading Animation. 487 // The timer used to update frames for the Loading Animation.
479 base::RepeatingTimer<BrowserView> loading_animation_timer_; 488 base::RepeatingTimer<BrowserView> loading_animation_timer_;
480 489
481 // A bottom bar for showing extensions. 490 // A bottom bar for showing extensions.
482 ExtensionShelf* extension_shelf_; 491 ExtensionShelf* extension_shelf_;
483 492
484 typedef std::set<BrowserBubble*> BubbleSet; 493 typedef std::set<BrowserBubble*> BubbleSet;
485 BubbleSet browser_bubbles_; 494 BubbleSet browser_bubbles_;
486 495
487 DISALLOW_COPY_AND_ASSIGN(BrowserView); 496 DISALLOW_COPY_AND_ASSIGN(BrowserView);
488 }; 497 };
489 498
490 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 499 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/jumplist.cc ('k') | chrome/browser/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698