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

Side by Side Diff: mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

Issue 506103002: Rename ApplicationLoader::OnServiceError to OnApplicationError (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge nits Created 6 years, 3 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 #include "mojo/services/public/cpp/view_manager/view_manager.h" 5 #include "mojo/services/public/cpp/view_manager/view_manager.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "mojo/application_manager/application_manager.h" 10 #include "mojo/application_manager/application_manager.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 const GURL& url, 57 const GURL& url,
58 scoped_refptr<LoadCallbacks> callbacks) OVERRIDE { 58 scoped_refptr<LoadCallbacks> callbacks) OVERRIDE {
59 ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication(); 59 ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
60 if (!shell_handle.is_valid()) 60 if (!shell_handle.is_valid())
61 return; 61 return;
62 scoped_ptr<ApplicationImpl> app(new ApplicationImpl(this, 62 scoped_ptr<ApplicationImpl> app(new ApplicationImpl(this,
63 shell_handle.Pass())); 63 shell_handle.Pass()));
64 apps_.push_back(app.release()); 64 apps_.push_back(app.release());
65 } 65 }
66 66
67 virtual void OnServiceError(ApplicationManager* manager, 67 virtual void OnApplicationError(ApplicationManager* manager,
68 const GURL& url) OVERRIDE {} 68 const GURL& url) OVERRIDE {}
69 69
70 virtual bool ConfigureIncomingConnection(ApplicationConnection* connection) 70 virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
71 OVERRIDE { 71 OVERRIDE {
72 connection->AddService(&view_manager_client_factory_); 72 connection->AddService(&view_manager_client_factory_);
73 return true; 73 return true;
74 } 74 }
75 75
76 // Overridden from ViewManagerDelegate: 76 // Overridden from ViewManagerDelegate:
77 virtual void OnEmbed(ViewManager* view_manager, 77 virtual void OnEmbed(ViewManager* view_manager,
78 View* root, 78 View* root,
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 521
522 // TODO(beng): tests for view event dispatcher. 522 // TODO(beng): tests for view event dispatcher.
523 // - verify that we see events for all views. 523 // - verify that we see events for all views.
524 524
525 // TODO(beng): tests for focus: 525 // TODO(beng): tests for focus:
526 // - focus between two views known to a connection 526 // - focus between two views known to a connection
527 // - focus between views unknown to one of the connections. 527 // - focus between views unknown to one of the connections.
528 // - focus between views unknown to either connection. 528 // - focus between views unknown to either connection.
529 529
530 } // namespace mojo 530 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698