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

Side by Side Diff: sky/tools/debugger/debugger.cc

Issue 788453002: Put code in //services/window_manager in namespace window_manager (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « sky/tools/debugger/debugger.h ('k') | sky/tools/tester/tester.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 "sky/tools/debugger/debugger.h" 5 #include "sky/tools/debugger/debugger.h"
6 6
7 #include "services/window_manager/basic_focus_rules.h" 7 #include "services/window_manager/basic_focus_rules.h"
8 8
9 namespace sky { 9 namespace sky {
10 namespace debugger { 10 namespace debugger {
11 11
12 SkyDebugger::SkyDebugger() 12 SkyDebugger::SkyDebugger()
13 : window_manager_app_(new mojo::WindowManagerApp(this, nullptr)), 13 : window_manager_app_(new window_manager::WindowManagerApp(this, nullptr)),
14 view_manager_(nullptr), 14 view_manager_(nullptr),
15 root_(nullptr), 15 root_(nullptr),
16 content_(nullptr), 16 content_(nullptr),
17 navigator_host_factory_(this), 17 navigator_host_factory_(this),
18 weak_factory_(this) { 18 weak_factory_(this) {
19 } 19 }
20 20
21 SkyDebugger::~SkyDebugger() { 21 SkyDebugger::~SkyDebugger() {
22 } 22 }
23 23
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 root_->AddObserver(this); 55 root_->AddObserver(this);
56 56
57 window_manager_app_->SetViewportSize(gfx::Size(320, 640)); 57 window_manager_app_->SetViewportSize(gfx::Size(320, 640));
58 58
59 content_ = mojo::View::Create(view_manager_); 59 content_ = mojo::View::Create(view_manager_);
60 content_->SetBounds(root_->bounds()); 60 content_->SetBounds(root_->bounds());
61 root_->AddChild(content_); 61 root_->AddChild(content_);
62 content_->SetVisible(true); 62 content_->SetVisible(true);
63 63
64 window_manager_app_->InitFocus( 64 window_manager_app_->InitFocus(
65 scoped_ptr<mojo::FocusRules>(new mojo::BasicFocusRules(content_))); 65 make_scoped_ptr(new window_manager::BasicFocusRules(content_)));
66 66
67 if (!pending_url_.empty()) 67 if (!pending_url_.empty())
68 NavigateToURL(pending_url_); 68 NavigateToURL(pending_url_);
69 } 69 }
70 70
71 void SkyDebugger::OnViewManagerDisconnected(mojo::ViewManager* view_manager) { 71 void SkyDebugger::OnViewManagerDisconnected(mojo::ViewManager* view_manager) {
72 view_manager_ = nullptr; 72 view_manager_ = nullptr;
73 root_ = nullptr; 73 root_ = nullptr;
74 } 74 }
75 75
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 } 116 }
117 117
118 void SkyDebugger::InjectInspector() { 118 void SkyDebugger::InjectInspector() {
119 InspectorServicePtr inspector_service; 119 InspectorServicePtr inspector_service;
120 mojo::ConnectToService(viewer_services_.get(), &inspector_service); 120 mojo::ConnectToService(viewer_services_.get(), &inspector_service);
121 inspector_service->Inject(); 121 inspector_service->Inject();
122 } 122 }
123 123
124 } // namespace debugger 124 } // namespace debugger
125 } // namespace sky 125 } // namespace sky
OLDNEW
« no previous file with comments | « sky/tools/debugger/debugger.h ('k') | sky/tools/tester/tester.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698