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

Side by Side Diff: chrome/browser/chromeos/status/status_area_view.h

Issue 9295049: Allow focus to be sent between browser window and launcher/status window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 (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_CHROMEOS_STATUS_STATUS_AREA_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <list> 9 #include <list>
10 10
(...skipping 29 matching lines...) Expand all
40 40
41 // Overridden from views::FocusChangeListener: 41 // Overridden from views::FocusChangeListener:
42 virtual void OnDidChangeFocus(views::View* focused_before, 42 virtual void OnDidChangeFocus(views::View* focused_before,
43 views::View* focused_now) OVERRIDE; 43 views::View* focused_now) OVERRIDE;
44 44
45 // views::View* overrides. 45 // views::View* overrides.
46 virtual gfx::Size GetPreferredSize() OVERRIDE; 46 virtual gfx::Size GetPreferredSize() OVERRIDE;
47 virtual void Layout() OVERRIDE; 47 virtual void Layout() OVERRIDE;
48 virtual void PreferredSizeChanged() OVERRIDE; 48 virtual void PreferredSizeChanged() OVERRIDE;
49 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; 49 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
50 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
50 51
51 private: 52 private:
52 StatusAreaButton::Delegate* delegate_; 53 StatusAreaButton::Delegate* delegate_;
53 54
54 // True if focus needs to be returned via |return_focus_cb_| when it wraps. 55 // True if focus needs to be returned via |return_focus_cb_| when it wraps.
55 bool need_return_focus_; 56 bool need_return_focus_;
56 ReturnFocusCallback return_focus_cb_; 57 ReturnFocusCallback return_focus_cb_;
57 58
59 ui::Accelerator ctrl_forward_key_;
60 ui::Accelerator ctrl_back_key_;
61
58 std::list<StatusAreaButton*> buttons_; 62 std::list<StatusAreaButton*> buttons_;
59 63
60 // Clears focus and calls |return_focus_cb_|. 64 // Clears focus and calls |return_focus_cb_|.
61 void ReturnFocus(bool reverse); 65 void ReturnFocus(bool reverse);
62 66
63 DISALLOW_COPY_AND_ASSIGN(StatusAreaView); 67 DISALLOW_COPY_AND_ASSIGN(StatusAreaView);
64 }; 68 };
65 69
66 #endif // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_H_ 70 #endif // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698