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

Side by Side Diff: ash/launcher/launcher.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
« no previous file with comments | « no previous file | ash/launcher/launcher.cc » ('j') | ash/launcher/launcher.cc » ('J')
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 ASH_LAUNCHER_LAUNCHER_H_ 5 #ifndef ASH_LAUNCHER_LAUNCHER_H_
6 #define ASH_LAUNCHER_LAUNCHER_H_ 6 #define ASH_LAUNCHER_LAUNCHER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 15 matching lines...) Expand all
26 public: 26 public:
27 explicit Launcher(aura::Window* window_container); 27 explicit Launcher(aura::Window* window_container);
28 ~Launcher(); 28 ~Launcher();
29 29
30 // Sets the width of the status area. 30 // Sets the width of the status area.
31 void SetStatusWidth(int width); 31 void SetStatusWidth(int width);
32 int GetStatusWidth(); 32 int GetStatusWidth();
33 33
34 LauncherModel* model() { return model_.get(); } 34 LauncherModel* model() { return model_.get(); }
35 views::Widget* widget() { return widget_; } 35 views::Widget* widget() { return widget_; }
36 bool Activate();
sky 2012/01/30 15:52:46 Newline between 35/36 and add a description.
Zachary Kuznia 2012/01/31 11:00:50 Done.
36 37
37 aura::Window* window_container() { return window_container_; } 38 aura::Window* window_container() { return window_container_; }
38 39
39 private: 40 private:
40 class DelegateView; 41 class DelegateView;
41 42
42 // If necessary asks the delegate if an entry should be created in the 43 // If necessary asks the delegate if an entry should be created in the
43 // launcher for |window|. This only asks the delegate once for a window. 44 // launcher for |window|. This only asks the delegate once for a window.
44 void MaybeAdd(aura::Window* window); 45 void MaybeAdd(aura::Window* window);
45 46
46 scoped_ptr<LauncherModel> model_; 47 scoped_ptr<LauncherModel> model_;
47 48
48 // Widget hosting the view. May be hidden if we're not using a launcher, 49 // Widget hosting the view. May be hidden if we're not using a launcher,
49 // e.g. Aura compact window mode. 50 // e.g. Aura compact window mode.
50 views::Widget* widget_; 51 views::Widget* widget_;
51 52
52 aura::Window* window_container_; 53 aura::Window* window_container_;
53 54
54 // Contents view of the widget. Houses the LauncherView. 55 // Contents view of the widget. Houses the LauncherView.
55 DelegateView* delegate_view_; 56 DelegateView* delegate_view_;
56 57
57 DISALLOW_COPY_AND_ASSIGN(Launcher); 58 DISALLOW_COPY_AND_ASSIGN(Launcher);
58 }; 59 };
59 60
60 } // namespace ash 61 } // namespace ash
61 62
62 #endif // ASH_LAUNCHER_LAUNCHER_H_ 63 #endif // ASH_LAUNCHER_LAUNCHER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/launcher/launcher.cc » ('j') | ash/launcher/launcher.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698