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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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 | « ui/app_list/cocoa/apps_search_box_controller.mm ('k') | ui/app_list/views/app_list_view.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 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"
11 #include "grit/ui_resources.h"
12 #include "ui/app_list/test/app_list_test_model.h" 11 #include "ui/app_list/test/app_list_test_model.h"
13 #include "ui/app_list/test/app_list_test_view_delegate.h" 12 #include "ui/app_list/test/app_list_test_view_delegate.h"
14 #include "ui/app_list/views/app_list_view.h" 13 #include "ui/app_list/views/app_list_view.h"
15 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/resources/grit/ui_resources.h"
16 #include "ui/views/controls/webview/webview.h" 16 #include "ui/views/controls/webview/webview.h"
17 #include "ui/views_content_client/views_content_client.h" 17 #include "ui/views_content_client/views_content_client.h"
18 18
19 #if defined(OS_WIN) 19 #if defined(OS_WIN)
20 #include "content/public/app/startup_helper_win.h" 20 #include "content/public/app/startup_helper_win.h"
21 #include "sandbox/win/src/sandbox_types.h" 21 #include "sandbox/win/src/sandbox_types.h"
22 #endif 22 #endif
23 23
24 namespace { 24 namespace {
25 25
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 content::InitializeSandboxInfo(&sandbox_info); 124 content::InitializeSandboxInfo(&sandbox_info);
125 ui::ViewsContentClient views_content_client(instance, &sandbox_info); 125 ui::ViewsContentClient views_content_client(instance, &sandbox_info);
126 #else 126 #else
127 int main(int argc, const char** argv) { 127 int main(int argc, const char** argv) {
128 ui::ViewsContentClient views_content_client(argc, argv); 128 ui::ViewsContentClient views_content_client(argc, argv);
129 #endif 129 #endif
130 130
131 views_content_client.set_task(base::Bind(&ShowAppList)); 131 views_content_client.set_task(base::Bind(&ShowAppList));
132 return views_content_client.RunMain(); 132 return views_content_client.RunMain();
133 } 133 }
OLDNEW
« no previous file with comments | « ui/app_list/cocoa/apps_search_box_controller.mm ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698