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

Side by Side Diff: trunk/src/chrome/browser/ui/gtk/apps/native_app_window_gtk.h

Issue 163913004: Revert 250826 "Remove Profile dependency from apps::ShellWindow" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_APPS_NATIVE_APP_WINDOW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_APPS_NATIVE_APP_WINDOW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_APPS_NATIVE_APP_WINDOW_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_APPS_NATIVE_APP_WINDOW_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "apps/shell_window.h" 10 #include "apps/shell_window.h"
11 #include "apps/ui/native_app_window.h" 11 #include "apps/ui/native_app_window.h"
12 #include "base/observer_list.h" 12 #include "base/observer_list.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h" 14 #include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h"
15 #include "content/public/browser/web_contents_observer.h" 15 #include "content/public/browser/web_contents_observer.h"
16 #include "third_party/skia/include/core/SkRegion.h" 16 #include "third_party/skia/include/core/SkRegion.h"
17 #include "ui/base/gtk/gtk_signal.h" 17 #include "ui/base/gtk/gtk_signal.h"
18 #include "ui/base/x/active_window_watcher_x_observer.h" 18 #include "ui/base/x/active_window_watcher_x_observer.h"
19 #include "ui/gfx/rect.h" 19 #include "ui/gfx/rect.h"
20 #include "ui/gfx/x/x11_atom_cache.h" 20 #include "ui/gfx/x/x11_atom_cache.h"
21 21
22 class ExtensionKeybindingRegistryGtk; 22 class ExtensionKeybindingRegistryGtk;
23 class Profile;
23 24
24 namespace extensions { 25 namespace extensions {
25 class Extension; 26 class Extension;
26 } 27 }
27 28
28 class NativeAppWindowGtk : public apps::NativeAppWindow, 29 class NativeAppWindowGtk : public apps::NativeAppWindow,
29 public ExtensionViewGtk::Container, 30 public ExtensionViewGtk::Container,
30 public ui::ActiveWindowWatcherXObserver, 31 public ui::ActiveWindowWatcherXObserver,
31 public content::WebContentsObserver { 32 public content::WebContentsObserver {
32 public: 33 public:
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 184
184 ui::X11AtomCache atom_cache_; 185 ui::X11AtomCache atom_cache_;
185 186
186 // True if we listen for the XEvent. 187 // True if we listen for the XEvent.
187 bool is_x_event_listened_; 188 bool is_x_event_listened_;
188 189
189 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowGtk); 190 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowGtk);
190 }; 191 };
191 192
192 #endif // CHROME_BROWSER_UI_GTK_APPS_NATIVE_APP_WINDOW_GTK_H_ 193 #endif // CHROME_BROWSER_UI_GTK_APPS_NATIVE_APP_WINDOW_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698