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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.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_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 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 const signin::ManageAccountsParams& manage_accounts_params, 359 const signin::ManageAccountsParams& manage_accounts_params,
360 signin_metrics::AccessPoint access_point) override; 360 signin_metrics::AccessPoint access_point) override;
361 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; 361 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
362 void ExecuteExtensionCommand(const extensions::Extension* extension, 362 void ExecuteExtensionCommand(const extensions::Extension* extension,
363 const extensions::Command& command) override; 363 const extensions::Command& command) override;
364 ExclusiveAccessContext* GetExclusiveAccessContext() override; 364 ExclusiveAccessContext* GetExclusiveAccessContext() override;
365 void ShowImeWarningBubble( 365 void ShowImeWarningBubble(
366 const extensions::Extension* extension, 366 const extensions::Extension* extension,
367 const base::Callback<void(ImeWarningBubblePermissionStatus status)>& 367 const base::Callback<void(ImeWarningBubblePermissionStatus status)>&
368 callback) override; 368 callback) override;
369 std::string GetWorkspace() const override;
369 370
370 BookmarkBarView* GetBookmarkBarView() const; 371 BookmarkBarView* GetBookmarkBarView() const;
371 LocationBarView* GetLocationBarView() const; 372 LocationBarView* GetLocationBarView() const;
372 views::View* GetTabContentsContainerView() const; 373 views::View* GetTabContentsContainerView() const;
373 ToolbarView* GetToolbarView() const; 374 ToolbarView* GetToolbarView() const;
374 375
375 // Overridden from TabStripModelObserver: 376 // Overridden from TabStripModelObserver:
376 void TabInsertedAt(content::WebContents* contents, 377 void TabInsertedAt(content::WebContents* contents,
377 int index, 378 int index,
378 bool foreground) override; 379 bool foreground) override;
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 // The class that registers for keyboard shortcuts for extension commands. 696 // The class that registers for keyboard shortcuts for extension commands.
696 std::unique_ptr<ExtensionKeybindingRegistryViews> 697 std::unique_ptr<ExtensionKeybindingRegistryViews>
697 extension_keybinding_registry_; 698 extension_keybinding_registry_;
698 699
699 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 700 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
700 701
701 DISALLOW_COPY_AND_ASSIGN(BrowserView); 702 DISALLOW_COPY_AND_ASSIGN(BrowserView);
702 }; 703 };
703 704
704 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 705 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698