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

Side by Side Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 1803143002: Replace BrowserProces::AddRefModule/RemoveModule by ScopedKeepAlive (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 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 (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 "chrome/browser/ui/views/chrome_views_delegate.h" 5 #include "chrome/browser/ui/views/chrome_views_delegate.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/lifetime/keep_alive_types.h"
14 #include "chrome/browser/lifetime/scoped_keep_alive.h"
13 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/ui/browser_window_state.h" 16 #include "chrome/browser/ui/browser_window_state.h"
15 #include "components/prefs/pref_service.h" 17 #include "components/prefs/pref_service.h"
16 #include "components/prefs/scoped_user_pref_update.h" 18 #include "components/prefs/scoped_user_pref_update.h"
17 #include "components/version_info/version_info.h" 19 #include "components/version_info/version_info.h"
18 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/context_factory.h" 21 #include "content/public/browser/context_factory.h"
20 #include "grit/chrome_unscaled_resources.h" 22 #include "grit/chrome_unscaled_resources.h"
21 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
22 #include "ui/base/ui_base_switches.h" 24 #include "ui/base/ui_base_switches.h"
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 306
305 #if defined(USE_ASH) 307 #if defined(USE_ASH)
306 views::NonClientFrameView* ChromeViewsDelegate::CreateDefaultNonClientFrameView( 308 views::NonClientFrameView* ChromeViewsDelegate::CreateDefaultNonClientFrameView(
307 views::Widget* widget) { 309 views::Widget* widget) {
308 return chrome::IsNativeViewInAsh(widget->GetNativeView()) ? 310 return chrome::IsNativeViewInAsh(widget->GetNativeView()) ?
309 ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget) : NULL; 311 ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget) : NULL;
310 } 312 }
311 #endif 313 #endif
312 314
313 void ChromeViewsDelegate::AddRef() { 315 void ChromeViewsDelegate::AddRef() {
314 g_browser_process->AddRefModule(); 316 keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::CHROME_VIEWS_DELEGATE,
317 KeepAliveRestartOption::DISABLED));
315 } 318 }
316 319
317 void ChromeViewsDelegate::ReleaseRef() { 320 void ChromeViewsDelegate::ReleaseRef() {
318 g_browser_process->ReleaseModule(); 321 keep_alive_.reset();
319 } 322 }
320 323
321 void ChromeViewsDelegate::OnBeforeWidgetInit( 324 void ChromeViewsDelegate::OnBeforeWidgetInit(
322 views::Widget::InitParams* params, 325 views::Widget::InitParams* params,
323 views::internal::NativeWidgetDelegate* delegate) { 326 views::internal::NativeWidgetDelegate* delegate) {
324 // We need to determine opacity if it's not already specified. 327 // We need to determine opacity if it's not already specified.
325 if (params->opacity == views::Widget::InitParams::INFER_OPACITY) 328 if (params->opacity == views::Widget::InitParams::INFER_OPACITY)
326 params->opacity = GetOpacityForInitParams(*params); 329 params->opacity = GetOpacityForInitParams(*params);
327 330
328 // If we already have a native_widget, we don't have to try to come 331 // If we already have a native_widget, we don't have to try to come
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 return content::BrowserThread::GetBlockingPool(); 508 return content::BrowserThread::GetBlockingPool();
506 } 509 }
507 510
508 #if !defined(USE_ASH) 511 #if !defined(USE_ASH)
509 views::Widget::InitParams::WindowOpacity 512 views::Widget::InitParams::WindowOpacity
510 ChromeViewsDelegate::GetOpacityForInitParams( 513 ChromeViewsDelegate::GetOpacityForInitParams(
511 const views::Widget::InitParams& params) { 514 const views::Widget::InitParams& params) {
512 return views::Widget::InitParams::OPAQUE_WINDOW; 515 return views::Widget::InitParams::OPAQUE_WINDOW;
513 } 516 }
514 #endif 517 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/chrome_views_delegate.h ('k') | chrome/browser/ui/views/uninstall_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698