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

Side by Side Diff: chrome/browser/ui/gtk/extensions/shell_window_gtk.h

Issue 10961066: Revert 158199 - extensions: Add ExtensionView interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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_GTK_EXTENSIONS_SHELL_WINDOW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_EXTENSIONS_SHELL_WINDOW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_EXTENSIONS_SHELL_WINDOW_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_EXTENSIONS_SHELL_WINDOW_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "base/timer.h" 10 #include "base/timer.h"
11 #include "chrome/browser/ui/extensions/native_shell_window.h" 11 #include "chrome/browser/ui/extensions/native_shell_window.h"
12 #include "chrome/browser/ui/extensions/shell_window.h" 12 #include "chrome/browser/ui/extensions/shell_window.h"
13 #include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h"
13 #include "third_party/skia/include/core/SkRegion.h" 14 #include "third_party/skia/include/core/SkRegion.h"
14 #include "ui/base/gtk/gtk_signal.h" 15 #include "ui/base/gtk/gtk_signal.h"
15 #include "ui/base/x/active_window_watcher_x_observer.h" 16 #include "ui/base/x/active_window_watcher_x_observer.h"
16 #include "ui/gfx/rect.h" 17 #include "ui/gfx/rect.h"
17 18
18 class ExtensionKeybindingRegistryGtk; 19 class ExtensionKeybindingRegistryGtk;
19 class Profile; 20 class Profile;
20 21
21 namespace extensions { 22 namespace extensions {
22 class Extension; 23 class Extension;
23 struct DraggableRegion; 24 struct DraggableRegion;
24 } 25 }
25 26
26 class ShellWindowGtk : public NativeShellWindow, 27 class ShellWindowGtk : public NativeShellWindow,
28 public ExtensionViewGtk::Container,
27 public ui::ActiveWindowWatcherXObserver { 29 public ui::ActiveWindowWatcherXObserver {
28 public: 30 public:
29 ShellWindowGtk(ShellWindow* shell_window, 31 ShellWindowGtk(ShellWindow* shell_window,
30 const ShellWindow::CreateParams& params); 32 const ShellWindow::CreateParams& params);
31 33
32 // BaseWindow implementation. 34 // BaseWindow implementation.
33 virtual bool IsActive() const OVERRIDE; 35 virtual bool IsActive() const OVERRIDE;
34 virtual bool IsMaximized() const OVERRIDE; 36 virtual bool IsMaximized() const OVERRIDE;
35 virtual bool IsMinimized() const OVERRIDE; 37 virtual bool IsMinimized() const OVERRIDE;
36 virtual bool IsFullscreen() const OVERRIDE; 38 virtual bool IsFullscreen() const OVERRIDE;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 121
120 // The Extension Keybinding Registry responsible for registering listeners for 122 // The Extension Keybinding Registry responsible for registering listeners for
121 // accelerators that are sent to the window, that are destined to be turned 123 // accelerators that are sent to the window, that are destined to be turned
122 // into events and sent to the extension. 124 // into events and sent to the extension.
123 scoped_ptr<ExtensionKeybindingRegistryGtk> extension_keybinding_registry_; 125 scoped_ptr<ExtensionKeybindingRegistryGtk> extension_keybinding_registry_;
124 126
125 DISALLOW_COPY_AND_ASSIGN(ShellWindowGtk); 127 DISALLOW_COPY_AND_ASSIGN(ShellWindowGtk);
126 }; 128 };
127 129
128 #endif // CHROME_BROWSER_UI_GTK_EXTENSIONS_SHELL_WINDOW_GTK_H_ 130 #endif // CHROME_BROWSER_UI_GTK_EXTENSIONS_SHELL_WINDOW_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/extensions/extension_view_gtk.cc ('k') | chrome/browser/ui/gtk/infobars/extension_infobar_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698