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

Side by Side Diff: ash/shell/content_client/shell_browser_main_parts.h

Issue 10535112: Prepare status area to support multiple trays. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 6 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/shell.cc ('k') | ash/shell/content_client/shell_browser_main_parts.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 ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
6 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_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 14 matching lines...) Expand all
25 class WindowWatcher; 25 class WindowWatcher;
26 26
27 class ShellBrowserMainParts : public content::BrowserMainParts { 27 class ShellBrowserMainParts : public content::BrowserMainParts {
28 public: 28 public:
29 explicit ShellBrowserMainParts( 29 explicit ShellBrowserMainParts(
30 const content::MainFunctionParams& parameters); 30 const content::MainFunctionParams& parameters);
31 virtual ~ShellBrowserMainParts(); 31 virtual ~ShellBrowserMainParts();
32 32
33 // Overridden from content::BrowserMainParts: 33 // Overridden from content::BrowserMainParts:
34 virtual void PreMainMessageLoopStart() OVERRIDE; 34 virtual void PreMainMessageLoopStart() OVERRIDE;
35 virtual void PostMainMessageLoopStart() OVERRIDE;
35 virtual void PreMainMessageLoopRun() OVERRIDE; 36 virtual void PreMainMessageLoopRun() OVERRIDE;
36 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 37 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
37 virtual void PostMainMessageLoopRun() OVERRIDE; 38 virtual void PostMainMessageLoopRun() OVERRIDE;
38 39
39 content::ShellBrowserContext* browser_context() { 40 content::ShellBrowserContext* browser_context() {
40 return browser_context_.get(); 41 return browser_context_.get();
41 } 42 }
42 43
43 private: 44 private:
44 scoped_ptr<content::ShellBrowserContext> browser_context_; 45 scoped_ptr<content::ShellBrowserContext> browser_context_;
45 scoped_ptr<ash::shell::WindowWatcher> window_watcher_; 46 scoped_ptr<ash::shell::WindowWatcher> window_watcher_;
46 47
47 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 48 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
48 }; 49 };
49 50
50 } // namespace shell 51 } // namespace shell
51 } // namespace ash 52 } // namespace ash
52 53
53 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 54 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698