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

Side by Side Diff: ash/shell.h

Issue 10054038: Support WebView in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « ash/ash.gyp ('k') | ash/shell/DEPS » ('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 ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 10 matching lines...) Expand all
21 21
22 class CommandLine; 22 class CommandLine;
23 class SkBitmap; 23 class SkBitmap;
24 24
25 namespace aura { 25 namespace aura {
26 class EventFilter; 26 class EventFilter;
27 class Monitor; 27 class Monitor;
28 class RootWindow; 28 class RootWindow;
29 class Window; 29 class Window;
30 } 30 }
31 namespace content {
32 class BrowserContext;
33 }
34
31 namespace gfx { 35 namespace gfx {
32 class Point; 36 class Point;
33 class Rect; 37 class Rect;
34 } 38 }
35 namespace ui { 39 namespace ui {
36 class Layer; 40 class Layer;
37 } 41 }
38 namespace views { 42 namespace views {
39 class NonClientFrameView; 43 class NonClientFrameView;
40 class Widget; 44 class Widget;
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 245
242 internal::ResizeShadowController* resize_shadow_controller() { 246 internal::ResizeShadowController* resize_shadow_controller() {
243 return resize_shadow_controller_.get(); 247 return resize_shadow_controller_.get();
244 } 248 }
245 249
246 // Made available for tests. 250 // Made available for tests.
247 internal::ShadowController* shadow_controller() { 251 internal::ShadowController* shadow_controller() {
248 return shadow_controller_.get(); 252 return shadow_controller_.get();
249 } 253 }
250 254
255 content::BrowserContext* browser_context() { return browser_context_; }
256 void set_browser_context(content::BrowserContext* browser_context) {
257 browser_context_ = browser_context;
258 }
259
251 private: 260 private:
252 FRIEND_TEST_ALL_PREFIXES(RootWindowEventFilterTest, MouseEventCursors); 261 FRIEND_TEST_ALL_PREFIXES(RootWindowEventFilterTest, MouseEventCursors);
253 FRIEND_TEST_ALL_PREFIXES(RootWindowEventFilterTest, TransformActivate); 262 FRIEND_TEST_ALL_PREFIXES(RootWindowEventFilterTest, TransformActivate);
254 263
255 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; 264 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
256 265
257 explicit Shell(ShellDelegate* delegate); 266 explicit Shell(ShellDelegate* delegate);
258 virtual ~Shell(); 267 virtual ~Shell();
259 268
260 void Init(); 269 void Init();
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 // Owned by aura::RootWindow, cached here for type safety. 347 // Owned by aura::RootWindow, cached here for type safety.
339 internal::RootWindowLayoutManager* root_window_layout_; 348 internal::RootWindowLayoutManager* root_window_layout_;
340 349
341 // Status area with clock, Wi-Fi signal, etc. 350 // Status area with clock, Wi-Fi signal, etc.
342 views::Widget* status_widget_; 351 views::Widget* status_widget_;
343 352
344 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for 353 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for
345 // |status_widget_|). 354 // |status_widget_|).
346 scoped_ptr<SystemTray> tray_; 355 scoped_ptr<SystemTray> tray_;
347 356
357 // Used by ash/shell.
358 content::BrowserContext* browser_context_;
359
348 DISALLOW_COPY_AND_ASSIGN(Shell); 360 DISALLOW_COPY_AND_ASSIGN(Shell);
349 }; 361 };
350 362
351 } // namespace ash 363 } // namespace ash
352 364
353 #endif // ASH_SHELL_H_ 365 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698