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

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

Issue 282133005: Removes unnecessary views::Widget::InitParams::top_level (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
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->top_level) 70 if (!params->parent && !params->context && !params->child)
71 params->context = Shell::GetPrimaryRootWindow(); 71 params->context = Shell::GetPrimaryRootWindow();
72 } 72 }
73 73
74 private: 74 private:
75 DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegate); 75 DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegate);
76 }; 76 };
77 77
78 } // namespace 78 } // namespace
79 79
80 ShellBrowserMainParts::ShellBrowserMainParts( 80 ShellBrowserMainParts::ShellBrowserMainParts(
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 browser_context_.reset(); 165 browser_context_.reset();
166 } 166 }
167 167
168 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 168 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
169 base::MessageLoopForUI::current()->Run(); 169 base::MessageLoopForUI::current()->Run();
170 return true; 170 return true;
171 } 171 }
172 172
173 } // namespace shell 173 } // namespace shell
174 } // namespace ash 174 } // namespace ash
OLDNEW
« no previous file with comments | « apps/ui/views/native_app_window_views.cc ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698