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

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

Issue 1927203003: Add support for X11 workspaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed GetSavedWindowWorkspace, put command line code into browser_frame.cc Created 4 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
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_FRAME_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 // Overridden from views::Widget: 99 // Overridden from views::Widget:
100 views::internal::RootView* CreateRootView() override; 100 views::internal::RootView* CreateRootView() override;
101 views::NonClientFrameView* CreateNonClientFrameView() override; 101 views::NonClientFrameView* CreateNonClientFrameView() override;
102 bool GetAccelerator(int command_id, 102 bool GetAccelerator(int command_id,
103 ui::Accelerator* accelerator) const override; 103 ui::Accelerator* accelerator) const override;
104 const ui::ThemeProvider* GetThemeProvider() const override; 104 const ui::ThemeProvider* GetThemeProvider() const override;
105 const ui::NativeTheme* GetNativeTheme() const override; 105 const ui::NativeTheme* GetNativeTheme() const override;
106 void SchedulePaintInRect(const gfx::Rect& rect) override; 106 void SchedulePaintInRect(const gfx::Rect& rect) override;
107 void OnNativeWidgetActivationChanged(bool active) override; 107 void OnNativeWidgetActivationChanged(bool active) override;
108 void OnNativeWidgetWorkspaceChanged() override;
108 109
109 // Overridden from views::ContextMenuController: 110 // Overridden from views::ContextMenuController:
110 void ShowContextMenuForView(views::View* source, 111 void ShowContextMenuForView(views::View* source,
111 const gfx::Point& p, 112 const gfx::Point& p,
112 ui::MenuSourceType source_type) override; 113 ui::MenuSourceType source_type) override;
113 114
114 AvatarMenuButton* GetAvatarMenuButton(); 115 AvatarMenuButton* GetAvatarMenuButton();
115 views::View* GetNewAvatarMenuButton(); 116 views::View* GetNewAvatarMenuButton();
116 117
117 // Returns the menu model. BrowserFrame owns the returned model. 118 // Returns the menu model. BrowserFrame owns the returned model.
(...skipping 21 matching lines...) Expand all
139 std::unique_ptr<views::MenuRunner> menu_runner_; 140 std::unique_ptr<views::MenuRunner> menu_runner_;
140 141
141 const ThemeService* theme_service_; 142 const ThemeService* theme_service_;
142 143
143 std::unique_ptr<ui::EventHandler> browser_command_handler_; 144 std::unique_ptr<ui::EventHandler> browser_command_handler_;
144 145
145 DISALLOW_COPY_AND_ASSIGN(BrowserFrame); 146 DISALLOW_COPY_AND_ASSIGN(BrowserFrame);
146 }; 147 };
147 148
148 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ 149 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698