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

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

Issue 10353007: Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 class FullscreenController; 63 class FullscreenController;
64 class InstantController; 64 class InstantController;
65 class InstantUnloadHandler; 65 class InstantUnloadHandler;
66 class PrefService; 66 class PrefService;
67 class Profile; 67 class Profile;
68 class SkBitmap; 68 class SkBitmap;
69 class StatusBubble; 69 class StatusBubble;
70 class TabNavigation; 70 class TabNavigation;
71 class TabStripModel; 71 class TabStripModel;
72 struct WebApplicationInfo; 72 struct WebApplicationInfo;
73 class WebDialogDelegate;
74 73
75 namespace content { 74 namespace content {
76 class NavigationController; 75 class NavigationController;
77 class SessionStorageNamespace; 76 class SessionStorageNamespace;
78 } 77 }
79 78
80 namespace gfx { 79 namespace gfx {
81 class Point; 80 class Point;
82 } 81 }
83 82
83 namespace web_dialogs {
84 class WebDialogDelegate;
85 }
86
84 class Browser : public TabHandlerDelegate, 87 class Browser : public TabHandlerDelegate,
85 public content::WebContentsDelegate, 88 public content::WebContentsDelegate,
86 public CoreTabHelperDelegate, 89 public CoreTabHelperDelegate,
87 public SearchEngineTabHelperDelegate, 90 public SearchEngineTabHelperDelegate,
88 public ConstrainedWindowTabHelperDelegate, 91 public ConstrainedWindowTabHelperDelegate,
89 public BlockedContentTabHelperDelegate, 92 public BlockedContentTabHelperDelegate,
90 public BookmarkTabHelperDelegate, 93 public BookmarkTabHelperDelegate,
91 public ExtensionTabHelperDelegate, 94 public ExtensionTabHelperDelegate,
92 public content::PageNavigator, 95 public content::PageNavigator,
93 public CommandUpdater::CommandUpdaterDelegate, 96 public CommandUpdater::CommandUpdaterDelegate,
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 const gfx::Rect& initial_pos, 487 const gfx::Rect& initial_pos,
485 bool user_gesture); 488 bool user_gesture);
486 void CloseTabContents(content::WebContents* contents); 489 void CloseTabContents(content::WebContents* contents);
487 490
488 // Shows a dialog with HTML content and returns it. |delegate| contains a 491 // Shows a dialog with HTML content and returns it. |delegate| contains a
489 // pointer to the delegate who knows how to display the dialog (which file 492 // pointer to the delegate who knows how to display the dialog (which file
490 // URL and JSON string input to use during initialization). |parent_window| 493 // URL and JSON string input to use during initialization). |parent_window|
491 // is the window that should be parent of the dialog, or NULL for the default. 494 // is the window that should be parent of the dialog, or NULL for the default.
492 // |style| customizes this HTML dialog decoration and layout (X button, 495 // |style| customizes this HTML dialog decoration and layout (X button,
493 // throbber, default content padding). 496 // throbber, default content padding).
494 gfx::NativeWindow BrowserShowWebDialog(WebDialogDelegate* delegate, 497 gfx::NativeWindow
495 gfx::NativeWindow parent_window); 498 BrowserShowWebDialog(web_dialogs::WebDialogDelegate* delegate,
tfarina 2012/05/04 18:16:37 the old indentation is right, when the parameter e
499 gfx::NativeWindow parent_window);
496 500
497 // Called when a popup select is about to be displayed. 501 // Called when a popup select is about to be displayed.
498 void BrowserRenderWidgetShowing(); 502 void BrowserRenderWidgetShowing();
499 503
500 // Notification that the bookmark bar has changed size. We need to resize the 504 // Notification that the bookmark bar has changed size. We need to resize the
501 // content area and notify our InfoBarContainer. 505 // content area and notify our InfoBarContainer.
502 void BookmarkBarSizeChanged(bool is_animating); 506 void BookmarkBarSizeChanged(bool is_animating);
503 507
504 // Replaces the state of the currently selected tab with the session 508 // Replaces the state of the currently selected tab with the session
505 // history restored from the SessionRestore system. 509 // history restored from the SessionRestore system.
(...skipping 979 matching lines...) Expand 10 before | Expand all | Expand 10 after
1485 bool window_has_shown_; 1489 bool window_has_shown_;
1486 1490
1487 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1491 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1488 // before DidEndColorChooser is called. 1492 // before DidEndColorChooser is called.
1489 scoped_ptr<content::ColorChooser> color_chooser_; 1493 scoped_ptr<content::ColorChooser> color_chooser_;
1490 1494
1491 DISALLOW_COPY_AND_ASSIGN(Browser); 1495 DISALLOW_COPY_AND_ASSIGN(Browser);
1492 }; 1496 };
1493 1497
1494 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1498 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698