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

Side by Side Diff: content/shell/shell_browser_main_parts.h

Issue 9982011: Mac content shell: Fix new browser window. (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 | « content/shell/shell_browser_context.cc ('k') | content/shell/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 CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ 5 #ifndef CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
6 #define CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ 6 #define CONTENT_SHELL_SHELL_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 26 matching lines...) Expand all
37 virtual void ToolkitInitialized() OVERRIDE {} 37 virtual void ToolkitInitialized() OVERRIDE {}
38 virtual int PreCreateThreads() OVERRIDE; 38 virtual int PreCreateThreads() OVERRIDE;
39 virtual void PreMainMessageLoopRun() OVERRIDE; 39 virtual void PreMainMessageLoopRun() OVERRIDE;
40 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 40 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
41 virtual void PostMainMessageLoopRun() OVERRIDE; 41 virtual void PostMainMessageLoopRun() OVERRIDE;
42 virtual void PostDestroyThreads() OVERRIDE {} 42 virtual void PostDestroyThreads() OVERRIDE {}
43 43
44 ui::Clipboard* GetClipboard(); 44 ui::Clipboard* GetClipboard();
45 ShellDevToolsDelegate* devtools_delegate() { return devtools_delegate_; } 45 ShellDevToolsDelegate* devtools_delegate() { return devtools_delegate_; }
46 46
47 ShellBrowserContext* browser_context() { return browser_context_.get(); }
48
47 private: 49 private:
50 scoped_ptr<ShellBrowserContext> browser_context_;
51
48 scoped_ptr<ui::Clipboard> clipboard_; 52 scoped_ptr<ui::Clipboard> clipboard_;
49 ShellDevToolsDelegate* devtools_delegate_; 53 ShellDevToolsDelegate* devtools_delegate_;
50 54
51 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 55 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
52 }; 56 };
53 57
54 } // namespace content 58 } // namespace content
55 59
56 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ 60 #endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « content/shell/shell_browser_context.cc ('k') | content/shell/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698