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

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

Issue 10908151: aura: Fix focus on web contents for popup windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't need check for initial show 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_frame_aura.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) 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_BROWSER_FRAME_AURA_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_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"
(...skipping 21 matching lines...) Expand all
32 32
33 BrowserView* browser_view() const { return browser_view_; } 33 BrowserView* browser_view() const { return browser_view_; }
34 34
35 protected: 35 protected:
36 // Overridden from views::ContextMenuController: 36 // Overridden from views::ContextMenuController:
37 virtual void ShowContextMenuForView(views::View* source, 37 virtual void ShowContextMenuForView(views::View* source,
38 const gfx::Point& p) OVERRIDE; 38 const gfx::Point& p) OVERRIDE;
39 39
40 // Overridden from views::NativeWidgetAura: 40 // Overridden from views::NativeWidgetAura:
41 virtual void OnWindowDestroying() OVERRIDE; 41 virtual void OnWindowDestroying() OVERRIDE;
42 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
42 43
43 // Overridden from NativeBrowserFrame: 44 // Overridden from NativeBrowserFrame:
44 virtual views::NativeWidget* AsNativeWidget() OVERRIDE; 45 virtual views::NativeWidget* AsNativeWidget() OVERRIDE;
45 virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE; 46 virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE;
46 virtual void InitSystemContextMenu() OVERRIDE; 47 virtual void InitSystemContextMenu() OVERRIDE;
47 virtual int GetMinimizeButtonOffset() const OVERRIDE; 48 virtual int GetMinimizeButtonOffset() const OVERRIDE;
48 virtual void TabStripDisplayModeChanged() OVERRIDE; 49 virtual void TabStripDisplayModeChanged() OVERRIDE;
49 50
50 private: 51 private:
51 class WindowPropertyWatcher; 52 class WindowPropertyWatcher;
52 53
53 virtual ~BrowserFrameAura(); 54 virtual ~BrowserFrameAura();
54 55
55 // The BrowserView is our ClientView. This is a pointer to it. 56 // The BrowserView is our ClientView. This is a pointer to it.
56 BrowserView* browser_view_; 57 BrowserView* browser_view_;
57 58
58 scoped_ptr<WindowPropertyWatcher> window_property_watcher_; 59 scoped_ptr<WindowPropertyWatcher> window_property_watcher_;
59 60
60 // System menu. 61 // System menu.
61 scoped_ptr<views::MenuRunner> menu_runner_; 62 scoped_ptr<views::MenuRunner> menu_runner_;
62 63
63 DISALLOW_COPY_AND_ASSIGN(BrowserFrameAura); 64 DISALLOW_COPY_AND_ASSIGN(BrowserFrameAura);
64 }; 65 };
65 66
66 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_ 67 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_frame_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698