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

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

Issue 183853037: aura: Remove client::UserActionClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unrevert Created 6 years, 9 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_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/views/frame/native_browser_frame.h" 10 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
11 #include "ui/views/context_menu_controller.h" 11 #include "ui/views/context_menu_controller.h"
12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
13 13
14 class BrowserDesktopWindowTreeHost; 14 class BrowserDesktopWindowTreeHost;
15 class BrowserFrame; 15 class BrowserFrame;
16 class BrowserView; 16 class BrowserView;
17 17
18 namespace aura {
19 namespace client {
20 class UserActionClient;
21 }
22 }
23
24 namespace views { 18 namespace views {
25 namespace corewm { 19 namespace corewm {
26 class VisibilityController; 20 class VisibilityController;
27 } 21 }
28 } 22 }
29 23
30 //////////////////////////////////////////////////////////////////////////////// 24 ////////////////////////////////////////////////////////////////////////////////
31 // DesktopBrowserFrameAura 25 // DesktopBrowserFrameAura
32 // 26 //
33 // DesktopBrowserFrameAura is a DesktopNativeWidgetAura subclass that provides 27 // DesktopBrowserFrameAura is a DesktopNativeWidgetAura subclass that provides
(...skipping 22 matching lines...) Expand all
56 virtual int GetMinimizeButtonOffset() const OVERRIDE; 50 virtual int GetMinimizeButtonOffset() const OVERRIDE;
57 51
58 private: 52 private:
59 // The BrowserView is our ClientView. This is a pointer to it. 53 // The BrowserView is our ClientView. This is a pointer to it.
60 BrowserView* browser_view_; 54 BrowserView* browser_view_;
61 BrowserFrame* browser_frame_; 55 BrowserFrame* browser_frame_;
62 56
63 // Owned by the RootWindow. 57 // Owned by the RootWindow.
64 BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_; 58 BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_;
65 59
66 scoped_ptr<aura::client::UserActionClient> user_action_client_;
67 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 60 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
68 61
69 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura); 62 DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura);
70 }; 63 };
71 64
72 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ 65 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame.cc ('k') | chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698