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

Side by Side Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/shell/content_client/shell_browser_main_parts.h" 5 #include "ash/shell/content_client/shell_browser_main_parts.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/desktop_background/desktop_background_controller.h" 8 #include "ash/desktop_background/desktop_background_controller.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell/shell_delegate_impl.h" 10 #include "ash/shell/shell_delegate_impl.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 namespace { 49 namespace {
50 50
51 class ShellViewsDelegate : public views::TestViewsDelegate { 51 class ShellViewsDelegate : public views::TestViewsDelegate {
52 public: 52 public:
53 ShellViewsDelegate() {} 53 ShellViewsDelegate() {}
54 virtual ~ShellViewsDelegate() {} 54 virtual ~ShellViewsDelegate() {}
55 55
56 // Overridden from views::TestViewsDelegate: 56 // Overridden from views::TestViewsDelegate:
57 virtual views::NonClientFrameView* CreateDefaultNonClientFrameView( 57 virtual views::NonClientFrameView* CreateDefaultNonClientFrameView(
58 views::Widget* widget) OVERRIDE { 58 views::Widget* widget) override {
59 return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget); 59 return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);
60 } 60 }
61 virtual void OnBeforeWidgetInit( 61 virtual void OnBeforeWidgetInit(
62 views::Widget::InitParams* params, 62 views::Widget::InitParams* params,
63 views::internal::NativeWidgetDelegate* delegate) OVERRIDE { 63 views::internal::NativeWidgetDelegate* delegate) override {
64 if (params->opacity == views::Widget::InitParams::INFER_OPACITY) 64 if (params->opacity == views::Widget::InitParams::INFER_OPACITY)
65 params->opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 65 params->opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
66 66
67 if (params->native_widget) 67 if (params->native_widget)
68 return; 68 return;
69 69
70 if (!params->parent && !params->context && !params->child) 70 if (!params->parent && !params->context && !params->child)
71 params->context = Shell::GetPrimaryRootWindow(); 71 params->context = Shell::GetPrimaryRootWindow();
72 } 72 }
73 73
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 browser_context_.reset(); 166 browser_context_.reset();
167 } 167 }
168 168
169 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 169 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
170 base::MessageLoopForUI::current()->Run(); 170 base::MessageLoopForUI::current()->Run();
171 return true; 171 return true;
172 } 172 }
173 173
174 } // namespace shell 174 } // namespace shell
175 } // namespace ash 175 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.h ('k') | ash/shell/content_client/shell_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698