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

Side by Side Diff: chrome/browser/ui/gtk/browser_window_gtk.h

Issue 22694002: InstantExtended: Nuke InstantOverlayController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_GTK_BROWSER_WINDOW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 505
506 // A container that manages the GtkWidget*s that are the webpage display 506 // A container that manages the GtkWidget*s that are the webpage display
507 // (along with associated infobars, shelves, and other things that are part 507 // (along with associated infobars, shelves, and other things that are part
508 // of the content area). 508 // of the content area).
509 scoped_ptr<TabContentsContainerGtk> contents_container_; 509 scoped_ptr<TabContentsContainerGtk> contents_container_;
510 510
511 // A container that manages the GtkWidget*s of developer tools for the 511 // A container that manages the GtkWidget*s of developer tools for the
512 // selected tab contents. 512 // selected tab contents.
513 scoped_ptr<TabContentsContainerGtk> devtools_container_; 513 scoped_ptr<TabContentsContainerGtk> devtools_container_;
514 514
515 // A sub-controller that manages the Instant overlay visual state.
516 scoped_ptr<InstantOverlayControllerGtk> instant_overlay_controller_;
517
518 // The Extension Keybinding Registry responsible for registering listeners for 515 // The Extension Keybinding Registry responsible for registering listeners for
519 // accelerators that are sent to the window, that are destined to be turned 516 // accelerators that are sent to the window, that are destined to be turned
520 // into events and sent to the extension. 517 // into events and sent to the extension.
521 scoped_ptr<ExtensionKeybindingRegistryGtk> extension_keybinding_registry_; 518 scoped_ptr<ExtensionKeybindingRegistryGtk> extension_keybinding_registry_;
522 519
523 DevToolsDockSide devtools_dock_side_; 520 DevToolsDockSide devtools_dock_side_;
524 521
525 // Docked devtools window instance. NULL when current tab is not inspected 522 // Docked devtools window instance. NULL when current tab is not inspected
526 // or is inspected with undocked version of DevToolsWindow. 523 // or is inspected with undocked version of DevToolsWindow.
527 DevToolsWindow* devtools_window_; 524 DevToolsWindow* devtools_window_;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_; 572 scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_;
576 573
577 FullscreenExitBubbleType fullscreen_exit_bubble_type_; 574 FullscreenExitBubbleType fullscreen_exit_bubble_type_;
578 575
579 content::NotificationRegistrar registrar_; 576 content::NotificationRegistrar registrar_;
580 577
581 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk); 578 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);
582 }; 579 };
583 580
584 #endif // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_ 581 #endif // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698