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

Side by Side Diff: chrome/browser/ui/gtk/download/download_shelf_gtk.h

Issue 10421021: Make DownloadProtectionService not use BrowserList::GetLastActive() to load a link. Instead pass th… (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
Property Changes:
Deleted: svn:mergeinfo
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_GTK_DOWNLOAD_DOWNLOAD_SHELF_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_SHELF_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_SHELF_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_SHELF_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 11 matching lines...) Expand all
22 #include "ui/base/gtk/owned_widget_gtk.h" 22 #include "ui/base/gtk/owned_widget_gtk.h"
23 #include "ui/gfx/native_widget_types.h" 23 #include "ui/gfx/native_widget_types.h"
24 24
25 class BaseDownloadItemModel; 25 class BaseDownloadItemModel;
26 class Browser; 26 class Browser;
27 class CustomDrawButton; 27 class CustomDrawButton;
28 class DownloadItemGtk; 28 class DownloadItemGtk;
29 class GtkThemeService; 29 class GtkThemeService;
30 class SlideAnimatorGtk; 30 class SlideAnimatorGtk;
31 31
32 namespace content {
33 class PageNavigator;
34 }
35
32 namespace gfx { 36 namespace gfx {
33 class Point; 37 class Point;
34 } 38 }
35 39
36 class DownloadShelfGtk : public DownloadShelf, 40 class DownloadShelfGtk : public DownloadShelf,
37 public content::NotificationObserver, 41 public content::NotificationObserver,
38 public SlideAnimatorGtk::Delegate, 42 public SlideAnimatorGtk::Delegate,
39 public MessageLoopForUI::Observer { 43 public MessageLoopForUI::Observer {
40 public: 44 public:
41 DownloadShelfGtk(Browser* browser, gfx::NativeView view); 45 DownloadShelfGtk(Browser* browser, gfx::NativeView view);
42 46
43 virtual ~DownloadShelfGtk(); 47 virtual ~DownloadShelfGtk();
44 48
49 // Retrieves the navigator for loading pages.
50 content::PageNavigator* GetNavigator();
51
45 // DownloadShelf implementation. 52 // DownloadShelf implementation.
46 virtual bool IsShowing() const OVERRIDE; 53 virtual bool IsShowing() const OVERRIDE;
47 virtual bool IsClosing() const OVERRIDE; 54 virtual bool IsClosing() const OVERRIDE;
48 virtual Browser* browser() const OVERRIDE; 55 virtual Browser* browser() const OVERRIDE;
49 56
50 // SlideAnimatorGtk::Delegate implementation. 57 // SlideAnimatorGtk::Delegate implementation.
51 virtual void Closed() OVERRIDE; 58 virtual void Closed() OVERRIDE;
52 59
53 // Overridden from content::NotificationObserver: 60 // Overridden from content::NotificationObserver:
54 virtual void Observe(int type, 61 virtual void Observe(int type,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 // True if the mouse is within the shelf's bounds, as of the last mouse event 154 // True if the mouse is within the shelf's bounds, as of the last mouse event
148 // we received. 155 // we received.
149 bool mouse_in_shelf_; 156 bool mouse_in_shelf_;
150 157
151 base::WeakPtrFactory<DownloadShelfGtk> weak_factory_; 158 base::WeakPtrFactory<DownloadShelfGtk> weak_factory_;
152 159
153 friend class DownloadItemGtk; 160 friend class DownloadItemGtk;
154 }; 161 };
155 162
156 #endif // CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_SHELF_GTK_H_ 163 #endif // CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_SHELF_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698