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

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

Issue 10448066: Move the web dialogs code to src/ui/web_dialogs from src/chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 6 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 class FullscreenController; 61 class FullscreenController;
62 class InstantController; 62 class InstantController;
63 class InstantUnloadHandler; 63 class InstantUnloadHandler;
64 class PrefService; 64 class PrefService;
65 class Profile; 65 class Profile;
66 class SkBitmap; 66 class SkBitmap;
67 class StatusBubble; 67 class StatusBubble;
68 class TabNavigation; 68 class TabNavigation;
69 class TabStripModel; 69 class TabStripModel;
70 struct WebApplicationInfo; 70 struct WebApplicationInfo;
71 class WebDialogDelegate;
72 71
73 namespace content { 72 namespace content {
74 class NavigationController; 73 class NavigationController;
75 class SessionStorageNamespace; 74 class SessionStorageNamespace;
76 } 75 }
77 76
78 namespace extensions { 77 namespace extensions {
79 class Extension; 78 class Extension;
80 } 79 }
81 80
82 namespace gfx { 81 namespace gfx {
83 class Point; 82 class Point;
84 } 83 }
85 84
85 namespace ui {
86 class WebDialogDelegate;
87 }
88
86 class Browser : public TabStripModelDelegate, 89 class Browser : public TabStripModelDelegate,
87 public TabStripModelObserver, 90 public TabStripModelObserver,
88 public content::WebContentsDelegate, 91 public content::WebContentsDelegate,
89 public CoreTabHelperDelegate, 92 public CoreTabHelperDelegate,
90 public SearchEngineTabHelperDelegate, 93 public SearchEngineTabHelperDelegate,
91 public ConstrainedWindowTabHelperDelegate, 94 public ConstrainedWindowTabHelperDelegate,
92 public BlockedContentTabHelperDelegate, 95 public BlockedContentTabHelperDelegate,
93 public BookmarkTabHelperDelegate, 96 public BookmarkTabHelperDelegate,
94 public ExtensionTabHelperDelegate, 97 public ExtensionTabHelperDelegate,
95 public content::PageNavigator, 98 public content::PageNavigator,
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 const gfx::Rect& initial_pos, 444 const gfx::Rect& initial_pos,
442 bool user_gesture); 445 bool user_gesture);
443 void CloseTabContents(content::WebContents* contents); 446 void CloseTabContents(content::WebContents* contents);
444 447
445 // Shows a dialog with HTML content and returns it. |delegate| contains a 448 // Shows a dialog with HTML content and returns it. |delegate| contains a
446 // pointer to the delegate who knows how to display the dialog (which file 449 // pointer to the delegate who knows how to display the dialog (which file
447 // URL and JSON string input to use during initialization). |parent_window| 450 // URL and JSON string input to use during initialization). |parent_window|
448 // is the window that should be parent of the dialog, or NULL for the default. 451 // is the window that should be parent of the dialog, or NULL for the default.
449 // |style| customizes this HTML dialog decoration and layout (X button, 452 // |style| customizes this HTML dialog decoration and layout (X button,
450 // throbber, default content padding). 453 // throbber, default content padding).
451 gfx::NativeWindow BrowserShowWebDialog(WebDialogDelegate* delegate, 454 gfx::NativeWindow BrowserShowWebDialog(ui::WebDialogDelegate* delegate,
452 gfx::NativeWindow parent_window); 455 gfx::NativeWindow parent_window);
453 456
454 // Called when a popup select is about to be displayed. 457 // Called when a popup select is about to be displayed.
455 void BrowserRenderWidgetShowing(); 458 void BrowserRenderWidgetShowing();
456 459
457 // Notification that the bookmark bar has changed size. We need to resize the 460 // Notification that the bookmark bar has changed size. We need to resize the
458 // content area and notify our InfoBarContainer. 461 // content area and notify our InfoBarContainer.
459 void BookmarkBarSizeChanged(bool is_animating); 462 void BookmarkBarSizeChanged(bool is_animating);
460 463
461 // Replaces the state of the currently selected tab with the session 464 // Replaces the state of the currently selected tab with the session
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 bool window_has_shown_; 1410 bool window_has_shown_;
1408 1411
1409 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1412 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1410 // before DidEndColorChooser is called. 1413 // before DidEndColorChooser is called.
1411 scoped_ptr<content::ColorChooser> color_chooser_; 1414 scoped_ptr<content::ColorChooser> color_chooser_;
1412 1415
1413 DISALLOW_COPY_AND_ASSIGN(Browser); 1416 DISALLOW_COPY_AND_ASSIGN(Browser);
1414 }; 1417 };
1415 1418
1416 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1419 #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