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

Side by Side Diff: examples/browser/browser.cc

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "base/strings/string_util.h" 6 #include "base/strings/string_util.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "examples/browser/browser_host.mojom.h" 8 #include "examples/browser/browser_host.mojom.h"
9 #include "examples/window_manager/window_manager.mojom.h" 9 #include "examples/window_manager/window_manager.mojom.h"
10 #include "mojo/application/application_runner_chromium.h" 10 #include "mojo/application/application_runner_chromium.h"
(...skipping 21 matching lines...) Expand all
32 class Browser : public ApplicationDelegate, 32 class Browser : public ApplicationDelegate,
33 public ViewManagerDelegate, 33 public ViewManagerDelegate,
34 public ViewObserver, 34 public ViewObserver,
35 public examples::BrowserHost, 35 public examples::BrowserHost,
36 public mojo::InterfaceFactory<examples::BrowserHost> { 36 public mojo::InterfaceFactory<examples::BrowserHost> {
37 public: 37 public:
38 Browser() : shell_(nullptr), root_(NULL), binding_(this) { 38 Browser() : shell_(nullptr), root_(NULL), binding_(this) {
39 browser_host_services_impl_.AddService(this); 39 browser_host_services_impl_.AddService(this);
40 } 40 }
41 41
42 virtual ~Browser() { 42 ~Browser() override {
43 if (root_) 43 if (root_)
44 root_->RemoveObserver(this); 44 root_->RemoveObserver(this);
45 } 45 }
46 46
47 private: 47 private:
48 // Overridden from ApplicationDelegate: 48 // Overridden from ApplicationDelegate:
49 void Initialize(ApplicationImpl* app) override { 49 void Initialize(ApplicationImpl* app) override {
50 shell_ = app->shell(); 50 shell_ = app->shell();
51 view_manager_client_factory_.reset( 51 view_manager_client_factory_.reset(
52 new ViewManagerClientFactory(shell_, this)); 52 new ViewManagerClientFactory(shell_, this));
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 DISALLOW_COPY_AND_ASSIGN(Browser); 130 DISALLOW_COPY_AND_ASSIGN(Browser);
131 }; 131 };
132 132
133 } // namespace examples 133 } // namespace examples
134 } // namespace mojo 134 } // namespace mojo
135 135
136 MojoResult MojoMain(MojoHandle shell_handle) { 136 MojoResult MojoMain(MojoHandle shell_handle) {
137 mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser); 137 mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser);
138 return runner.Run(shell_handle); 138 return runner.Run(shell_handle);
139 } 139 }
OLDNEW
« no previous file with comments | « examples/bitmap_uploader/bitmap_uploader.h ('k') | examples/content_handler_demo/content_handler_demo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698