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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 2697513008: Linux Aura: Use Aura theme on all windows when 'Use Classic theme' is used (Closed)
Patch Set: Move kThemeProfileKey into c/b/ui/views/frame/browser_view.h 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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 public InfoBarContainerDelegate, 94 public InfoBarContainerDelegate,
95 public LoadCompleteListener::Delegate, 95 public LoadCompleteListener::Delegate,
96 public OmniboxPopupModelObserver, 96 public OmniboxPopupModelObserver,
97 public ExclusiveAccessContext, 97 public ExclusiveAccessContext,
98 public ExclusiveAccessBubbleViewsContext, 98 public ExclusiveAccessBubbleViewsContext,
99 public extensions::ExtensionKeybindingRegistry::Delegate { 99 public extensions::ExtensionKeybindingRegistry::Delegate {
100 public: 100 public:
101 // The browser view's class name. 101 // The browser view's class name.
102 static const char kViewClassName[]; 102 static const char kViewClassName[];
103 103
104 // Key used to bind an original (non-incognito) profile to the
105 // widget with which it is associated. Only used on Linux for
106 // determining if windows should use the system theme.
107 static const char kThemeProfileKey[];
sky 2017/02/16 22:10:32 As this is used in places other than browser_view,
Tom (Use chromium acct) 2017/02/17 00:35:31 Done.
108
104 BrowserView(); 109 BrowserView();
105 ~BrowserView() override; 110 ~BrowserView() override;
106 111
107 // Takes ownership of |browser|. 112 // Takes ownership of |browser|.
108 void Init(Browser* browser); 113 void Init(Browser* browser);
109 114
110 void set_frame(BrowserFrame* frame) { frame_ = frame; } 115 void set_frame(BrowserFrame* frame) { frame_ = frame; }
111 BrowserFrame* frame() const { return frame_; } 116 BrowserFrame* frame() const { return frame_; }
112 117
113 // Returns a pointer to the BrowserView* interface implementation (an 118 // Returns a pointer to the BrowserView* interface implementation (an
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 // The class that registers for keyboard shortcuts for extension commands. 715 // The class that registers for keyboard shortcuts for extension commands.
711 std::unique_ptr<ExtensionKeybindingRegistryViews> 716 std::unique_ptr<ExtensionKeybindingRegistryViews>
712 extension_keybinding_registry_; 717 extension_keybinding_registry_;
713 718
714 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 719 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
715 720
716 DISALLOW_COPY_AND_ASSIGN(BrowserView); 721 DISALLOW_COPY_AND_ASSIGN(BrowserView);
717 }; 722 };
718 723
719 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 724 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698