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

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

Issue 1637203002: [MD] Don't use new OTR native-theming when using a custom browser theme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move lifetime comment Created 4 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/dropdown_bar_host.h" 5 #include "chrome/browser/ui/views/dropdown_bar_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "chrome/browser/ui/view_ids.h" 9 #include "chrome/browser/ui/view_ids.h"
10 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h" 10 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
11 #include "chrome/browser/ui/views/dropdown_bar_view.h" 11 #include "chrome/browser/ui/views/dropdown_bar_view.h"
12 #include "chrome/browser/ui/views/frame/browser_view.h" 12 #include "chrome/browser/ui/views/frame/browser_view.h"
13 #include "chrome/browser/ui/views/theme_copying_widget.h"
13 #include "ui/events/keycodes/keyboard_codes.h" 14 #include "ui/events/keycodes/keyboard_codes.h"
14 #include "ui/gfx/animation/slide_animation.h" 15 #include "ui/gfx/animation/slide_animation.h"
15 #include "ui/gfx/scrollbar_size.h" 16 #include "ui/gfx/scrollbar_size.h"
16 #include "ui/views/focus/external_focus_tracker.h" 17 #include "ui/views/focus/external_focus_tracker.h"
17 #include "ui/views/focus/view_storage.h" 18 #include "ui/views/focus/view_storage.h"
18 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
19 20
20 // static 21 // static
21 bool DropdownBarHost::disable_animations_during_testing_ = false; 22 bool DropdownBarHost::disable_animations_during_testing_ = false;
22 23
(...skipping 18 matching lines...) Expand all
41 void DropdownBarHost::Init(views::View* host_view, 42 void DropdownBarHost::Init(views::View* host_view,
42 views::View* view, 43 views::View* view,
43 DropdownBarHostDelegate* delegate) { 44 DropdownBarHostDelegate* delegate) {
44 DCHECK(view); 45 DCHECK(view);
45 DCHECK(delegate); 46 DCHECK(delegate);
46 47
47 view_ = view; 48 view_ = view;
48 delegate_ = delegate; 49 delegate_ = delegate;
49 50
50 // Initialize the host. 51 // Initialize the host.
51 host_.reset(new views::Widget); 52 host_.reset(new ThemeCopyingWidget(browser_view_->GetWidget()));
52 views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL); 53 views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
53 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 54 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
54 params.parent = browser_view_->GetWidget()->GetNativeView(); 55 params.parent = browser_view_->GetWidget()->GetNativeView();
55 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 56 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
56 host_->Init(params); 57 host_->Init(params);
57 host_->SetContentsView(clip_view_); 58 host_->SetContentsView(clip_view_);
58 clip_view_->AddChildView(view_); 59 clip_view_->AddChildView(view_);
59 60
60 SetHostViewNative(host_view); 61 SetHostViewNative(host_view);
61 62
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 escape, ui::AcceleratorManager::kNormalPriority, this); 229 escape, ui::AcceleratorManager::kNormalPriority, this);
229 esc_accel_target_registered_ = true; 230 esc_accel_target_registered_ = true;
230 } 231 }
231 232
232 void DropdownBarHost::UnregisterAccelerators() { 233 void DropdownBarHost::UnregisterAccelerators() {
233 DCHECK(esc_accel_target_registered_); 234 DCHECK(esc_accel_target_registered_);
234 ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE); 235 ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE);
235 focus_manager_->UnregisterAccelerator(escape, this); 236 focus_manager_->UnregisterAccelerator(escape, this);
236 esc_accel_target_registered_ = false; 237 esc_accel_target_registered_ = false;
237 } 238 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc ('k') | chrome/browser/ui/views/frame/browser_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698