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

Side by Side Diff: ui/app_list/demo/app_list_demo_views.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on 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
« no previous file with comments | « ui/app_list/cocoa/apps_search_results_model_bridge.mm ('k') | ui/app_list/pagination_model.h » ('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 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 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 21 matching lines...) Expand all
32 // window is closed, and to close the window if it is simply dismissed. 32 // window is closed, and to close the window if it is simply dismissed.
33 class DemoAppListViewDelegate : public app_list::test::AppListTestViewDelegate { 33 class DemoAppListViewDelegate : public app_list::test::AppListTestViewDelegate {
34 public: 34 public:
35 explicit DemoAppListViewDelegate(content::BrowserContext* browser_context) 35 explicit DemoAppListViewDelegate(content::BrowserContext* browser_context)
36 : view_(NULL), browser_context_(browser_context) {} 36 : view_(NULL), browser_context_(browser_context) {}
37 virtual ~DemoAppListViewDelegate() {} 37 virtual ~DemoAppListViewDelegate() {}
38 38
39 app_list::AppListView* InitView(gfx::NativeWindow window_context); 39 app_list::AppListView* InitView(gfx::NativeWindow window_context);
40 40
41 // Overridden from AppListViewDelegate: 41 // Overridden from AppListViewDelegate:
42 virtual void Dismiss() OVERRIDE; 42 virtual void Dismiss() override;
43 virtual void ViewClosing() OVERRIDE; 43 virtual void ViewClosing() override;
44 virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE; 44 virtual views::View* CreateStartPageWebView(const gfx::Size& size) override;
45 45
46 private: 46 private:
47 app_list::AppListView* view_; // Weak. Owns this. 47 app_list::AppListView* view_; // Weak. Owns this.
48 content::BrowserContext* browser_context_; 48 content::BrowserContext* browser_context_;
49 scoped_ptr<content::WebContents> web_contents_; 49 scoped_ptr<content::WebContents> web_contents_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(DemoAppListViewDelegate); 51 DISALLOW_COPY_AND_ASSIGN(DemoAppListViewDelegate);
52 }; 52 };
53 53
54 app_list::AppListView* DemoAppListViewDelegate::InitView( 54 app_list::AppListView* DemoAppListViewDelegate::InitView(
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 content::InitializeSandboxInfo(&sandbox_info); 123 content::InitializeSandboxInfo(&sandbox_info);
124 ui::ViewsContentClient views_content_client(instance, &sandbox_info); 124 ui::ViewsContentClient views_content_client(instance, &sandbox_info);
125 #else 125 #else
126 int main(int argc, const char** argv) { 126 int main(int argc, const char** argv) {
127 ui::ViewsContentClient views_content_client(argc, argv); 127 ui::ViewsContentClient views_content_client(argc, argv);
128 #endif 128 #endif
129 129
130 views_content_client.set_task(base::Bind(&ShowAppList)); 130 views_content_client.set_task(base::Bind(&ShowAppList));
131 return views_content_client.RunMain(); 131 return views_content_client.RunMain();
132 } 132 }
OLDNEW
« no previous file with comments | « ui/app_list/cocoa/apps_search_results_model_bridge.mm ('k') | ui/app_list/pagination_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698