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

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

Issue 10214001: WebDialogs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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
« no previous file with comments | « chrome/browser/printing/print_preview_tab_controller.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 class BrowserContentSettingBubbleModelDelegate; 56 class BrowserContentSettingBubbleModelDelegate;
57 class BrowserSyncedWindowDelegate; 57 class BrowserSyncedWindowDelegate;
58 class BrowserToolbarModelDelegate; 58 class BrowserToolbarModelDelegate;
59 class BrowserTabRestoreServiceDelegate; 59 class BrowserTabRestoreServiceDelegate;
60 class BrowserWindow; 60 class BrowserWindow;
61 class Extension; 61 class Extension;
62 class ExtensionWindowController; 62 class ExtensionWindowController;
63 class FindBarController; 63 class FindBarController;
64 class FullscreenController; 64 class FullscreenController;
65 class HtmlDialogUIDelegate;
66 class InstantController; 65 class InstantController;
67 class InstantUnloadHandler; 66 class InstantUnloadHandler;
68 class PrefService; 67 class PrefService;
69 class Profile; 68 class Profile;
70 class SkBitmap; 69 class SkBitmap;
71 class StatusBubble; 70 class StatusBubble;
72 class TabNavigation; 71 class TabNavigation;
73 class TabStripModel; 72 class TabStripModel;
74 struct WebApplicationInfo; 73 struct WebApplicationInfo;
74 class WebDialogDelegate;
75 75
76 namespace content { 76 namespace content {
77 class NavigationController; 77 class NavigationController;
78 class SessionStorageNamespace; 78 class SessionStorageNamespace;
79 } 79 }
80 80
81 namespace gfx { 81 namespace gfx {
82 class Point; 82 class Point;
83 } 83 }
84 84
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 488
489 // Shows a dialog with HTML content and returns it. |delegate| contains a 489 // Shows a dialog with HTML content and returns it. |delegate| contains a
490 // pointer to the delegate who knows how to display the dialog (which file 490 // pointer to the delegate who knows how to display the dialog (which file
491 // URL and JSON string input to use during initialization). |parent_window| 491 // URL and JSON string input to use during initialization). |parent_window|
492 // is the window that should be parent of the dialog, or NULL for the default. 492 // is the window that should be parent of the dialog, or NULL for the default.
493 // |style| customizes this HTML dialog decoration and layout (X button, 493 // |style| customizes this HTML dialog decoration and layout (X button,
494 // throbber, default content padding). Except ChromeOS, other platforms 494 // throbber, default content padding). Except ChromeOS, other platforms
495 // only have STYLE_GENERIC now. 495 // only have STYLE_GENERIC now.
496 // TODO(bshe): Implementing styles not related to window decoration in other 496 // TODO(bshe): Implementing styles not related to window decoration in other
497 // platforms for consistency if necessary. 497 // platforms for consistency if necessary.
498 gfx::NativeWindow BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, 498 gfx::NativeWindow BrowserShowWebDialog(
499 gfx::NativeWindow parent_window, 499 WebDialogDelegate* delegate,
500 DialogStyle style); 500 gfx::NativeWindow parent_window,
501 DialogStyle style);
501 502
502 // Called when a popup select is about to be displayed. 503 // Called when a popup select is about to be displayed.
503 void BrowserRenderWidgetShowing(); 504 void BrowserRenderWidgetShowing();
504 505
505 // Notification that the bookmark bar has changed size. We need to resize the 506 // Notification that the bookmark bar has changed size. We need to resize the
506 // content area and notify our InfoBarContainer. 507 // content area and notify our InfoBarContainer.
507 void BookmarkBarSizeChanged(bool is_animating); 508 void BookmarkBarSizeChanged(bool is_animating);
508 509
509 // Replaces the state of the currently selected tab with the session 510 // Replaces the state of the currently selected tab with the session
510 // history restored from the SessionRestore system. 511 // history restored from the SessionRestore system.
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1485 bool window_has_shown_; 1486 bool window_has_shown_;
1486 1487
1487 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1488 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1488 // before DidEndColorChooser is called. 1489 // before DidEndColorChooser is called.
1489 scoped_ptr<content::ColorChooser> color_chooser_; 1490 scoped_ptr<content::ColorChooser> color_chooser_;
1490 1491
1491 DISALLOW_COPY_AND_ASSIGN(Browser); 1492 DISALLOW_COPY_AND_ASSIGN(Browser);
1492 }; 1493 };
1493 1494
1494 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1495 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/printing/print_preview_tab_controller.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698