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

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

Issue 2660553005: Harmony - convert hung renderer dialog. (Closed)
Patch Set: merge Created 3 years, 10 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 <memory> 7 #include <memory>
8 8
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/threading/thread_task_runner_handle.h" 15 #include "base/threading/thread_task_runner_handle.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/lifetime/keep_alive_types.h" 19 #include "chrome/browser/lifetime/keep_alive_types.h"
20 #include "chrome/browser/lifetime/scoped_keep_alive.h" 20 #include "chrome/browser/lifetime/scoped_keep_alive.h"
21 #include "chrome/browser/profiles/profile_manager.h" 21 #include "chrome/browser/profiles/profile_manager.h"
22 #include "chrome/browser/ui/ash/ash_util.h" 22 #include "chrome/browser/ui/ash/ash_util.h"
23 #include "chrome/browser/ui/browser_window_state.h" 23 #include "chrome/browser/ui/browser_window_state.h"
24 #include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h" 24 #include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h"
25 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
tapted 2017/02/03 02:07:54 remove?
Bret 2017/02/03 21:58:35 Done.
25 #include "chrome/grit/chrome_unscaled_resources.h" 26 #include "chrome/grit/chrome_unscaled_resources.h"
26 #include "components/prefs/pref_service.h" 27 #include "components/prefs/pref_service.h"
27 #include "components/prefs/scoped_user_pref_update.h" 28 #include "components/prefs/scoped_user_pref_update.h"
28 #include "components/version_info/version_info.h" 29 #include "components/version_info/version_info.h"
29 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/context_factory.h" 31 #include "content/public/browser/context_factory.h"
31 #include "ui/base/material_design/material_design_controller.h" 32 #include "ui/base/material_design/material_design_controller.h"
32 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
33 #include "ui/base/ui_base_switches.h" 34 #include "ui/base/ui_base_switches.h"
34 #include "ui/display/display.h" 35 #include "ui/display/display.h"
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 LayoutDelegate::Metric::PANEL_CONTENT_MARGIN)); 572 LayoutDelegate::Metric::PANEL_CONTENT_MARGIN));
572 } 573 }
573 574
574 #if !defined(USE_ASH) 575 #if !defined(USE_ASH)
575 views::Widget::InitParams::WindowOpacity 576 views::Widget::InitParams::WindowOpacity
576 ChromeViewsDelegate::GetOpacityForInitParams( 577 ChromeViewsDelegate::GetOpacityForInitParams(
577 const views::Widget::InitParams& params) { 578 const views::Widget::InitParams& params) {
578 return views::Widget::InitParams::OPAQUE_WINDOW; 579 return views::Widget::InitParams::OPAQUE_WINDOW;
579 } 580 }
580 #endif 581 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698