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

Side by Side Diff: chromecast/service/cast_service_simple.cc

Issue 630663003: replace OVERRIDE and FINAL with override and final in chromecast/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « chromecast/service/cast_service_simple.h ('k') | chromecast/shell/app/cast_main_delegate.h » ('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 "chromecast/service/cast_service_simple.h" 5 #include "chromecast/service/cast_service_simple.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "content/public/browser/render_view_host.h" 10 #include "content/public/browser/render_view_host.h"
(...skipping 26 matching lines...) Expand all
37 return net::FilePathToFileURL(base::FilePath(args[0])); 37 return net::FilePathToFileURL(base::FilePath(args[0]));
38 } 38 }
39 39
40 class FillLayout : public aura::LayoutManager { 40 class FillLayout : public aura::LayoutManager {
41 public: 41 public:
42 explicit FillLayout(aura::Window* root) : root_(root) {} 42 explicit FillLayout(aura::Window* root) : root_(root) {}
43 virtual ~FillLayout() {} 43 virtual ~FillLayout() {}
44 44
45 private: 45 private:
46 // aura::LayoutManager: 46 // aura::LayoutManager:
47 virtual void OnWindowResized() OVERRIDE {} 47 virtual void OnWindowResized() override {}
48 48
49 virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE { 49 virtual void OnWindowAddedToLayout(aura::Window* child) override {
50 child->SetBounds(root_->bounds()); 50 child->SetBounds(root_->bounds());
51 } 51 }
52 52
53 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {} 53 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {}
54 54
55 virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {} 55 virtual void OnWindowRemovedFromLayout(aura::Window* child) override {}
56 56
57 virtual void OnChildWindowVisibilityChanged(aura::Window* child, 57 virtual void OnChildWindowVisibilityChanged(aura::Window* child,
58 bool visible) OVERRIDE {} 58 bool visible) override {}
59 59
60 virtual void SetChildBounds(aura::Window* child, 60 virtual void SetChildBounds(aura::Window* child,
61 const gfx::Rect& requested_bounds) OVERRIDE { 61 const gfx::Rect& requested_bounds) override {
62 SetChildBoundsDirect(child, requested_bounds); 62 SetChildBoundsDirect(child, requested_bounds);
63 } 63 }
64 64
65 aura::Window* root_; 65 aura::Window* root_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(FillLayout); 67 DISALLOW_COPY_AND_ASSIGN(FillLayout);
68 }; 68 };
69 69
70 } // namespace 70 } // namespace
71 71
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 void CastServiceSimple::StopInternal() { 128 void CastServiceSimple::StopInternal() {
129 web_contents_->GetRenderViewHost()->ClosePage(); 129 web_contents_->GetRenderViewHost()->ClosePage();
130 window_tree_host_.reset(); 130 window_tree_host_.reset();
131 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); 131 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
132 aura::Env::DeleteInstance(); 132 aura::Env::DeleteInstance();
133 web_contents_.reset(); 133 web_contents_.reset();
134 } 134 }
135 135
136 } // namespace chromecast 136 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/service/cast_service_simple.h ('k') | chromecast/shell/app/cast_main_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698