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

Side by Side Diff: blimp/engine/app/blimp_content_browser_client.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 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 | « blimp/engine/DEPS ('k') | blimp/engine/renderer/blob_channel_sender_proxy.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) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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/json/json_reader.h" 5 #include "base/json/json_reader.h"
6 #include "blimp/engine/app/blimp_browser_main_parts.h" 6 #include "blimp/engine/app/blimp_browser_main_parts.h"
7 #include "blimp/engine/app/blimp_content_browser_client.h" 7 #include "blimp/engine/app/blimp_content_browser_client.h"
8 #include "blimp/engine/app/settings_manager.h" 8 #include "blimp/engine/app/settings_manager.h"
9 #include "blimp/engine/grit/blimp_browser_resources.h" 9 #include "blimp/engine/grit/blimp_browser_resources.h"
10 #include "blimp/engine/mojo/blob_channel_service.h" 10 #include "blimp/engine/mojo/blob_channel_service.h"
11 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
12 #include "content/public/common/service_names.h" 12 #include "content/public/common/service_names.h"
13 #include "services/shell/public/cpp/interface_registry.h" 13 #include "services/service_manager/public/cpp/interface_registry.h"
14 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
15 15
16 namespace blimp { 16 namespace blimp {
17 namespace engine { 17 namespace engine {
18 18
19 BlimpContentBrowserClient::BlimpContentBrowserClient() {} 19 BlimpContentBrowserClient::BlimpContentBrowserClient() {}
20 20
21 BlimpContentBrowserClient::~BlimpContentBrowserClient() {} 21 BlimpContentBrowserClient::~BlimpContentBrowserClient() {}
22 22
23 content::BrowserMainParts* BlimpContentBrowserClient::CreateBrowserMainParts( 23 content::BrowserMainParts* BlimpContentBrowserClient::CreateBrowserMainParts(
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 return nullptr; 64 return nullptr;
65 } 65 }
66 66
67 base::StringPiece manifest_contents = 67 base::StringPiece manifest_contents =
68 rb.GetRawDataResourceForScale(id, ui::ScaleFactor::SCALE_FACTOR_NONE); 68 rb.GetRawDataResourceForScale(id, ui::ScaleFactor::SCALE_FACTOR_NONE);
69 return base::JSONReader::Read(manifest_contents); 69 return base::JSONReader::Read(manifest_contents);
70 } 70 }
71 71
72 } // namespace engine 72 } // namespace engine
73 } // namespace blimp 73 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/engine/DEPS ('k') | blimp/engine/renderer/blob_channel_sender_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698