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

Side by Side Diff: ui/views_content_client/views_content_client_main_parts.h

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix a few things. Works@master Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ 5 #ifndef UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_
6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ 6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/browser/browser_main_parts.h" 10 #include "content/public/browser/browser_main_parts.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 ViewsContentClient* views_content_client() { 43 ViewsContentClient* views_content_client() {
44 return views_content_client_; 44 return views_content_client_;
45 } 45 }
46 46
47 protected: 47 protected:
48 ViewsContentClientMainParts( 48 ViewsContentClientMainParts(
49 const content::MainFunctionParams& content_params, 49 const content::MainFunctionParams& content_params,
50 ViewsContentClient* views_content_client); 50 ViewsContentClient* views_content_client);
51 51
52 private: 52 protected: //FIXME
53 scoped_ptr<content::ShellBrowserContext> browser_context_; 53 scoped_ptr<content::ShellBrowserContext> browser_context_;
54 54
55 scoped_ptr<views::ViewsDelegate> views_delegate_; 55 scoped_ptr<views::ViewsDelegate> views_delegate_;
56 56
57 ViewsContentClient* views_content_client_; 57 ViewsContentClient* views_content_client_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainParts); 59 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainParts);
60 }; 60 };
61 61
62 } // namespace ui 62 } // namespace ui
63 63
64 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ 64 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « ui/views/widget/widget_unittest.cc ('k') | ui/views_content_client/views_content_client_main_parts_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698