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

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

Issue 6881073: Cleanup popup related browser navigation code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Popup tests for ChromeOS. Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_WINDOW_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_WINDOW_H_
6 #define CHROME_BROWSER_UI_BROWSER_WINDOW_H_ 6 #define CHROME_BROWSER_UI_BROWSER_WINDOW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/common/content_settings_types.h" 9 #include "chrome/common/content_settings_types.h"
10 #include "content/browser/tab_contents/navigation_entry.h" 10 #include "content/browser/tab_contents/navigation_entry.h"
(...skipping 19 matching lines...) Expand all
30 struct NativeWebKeyboardEvent; 30 struct NativeWebKeyboardEvent;
31 31
32 namespace gfx { 32 namespace gfx {
33 class Rect; 33 class Rect;
34 } 34 }
35 35
36 namespace views { 36 namespace views {
37 class Window; 37 class Window;
38 } 38 }
39 39
40 namespace browser {
41 struct NavigateParams;
42 }
43
40 class Extension; 44 class Extension;
41 45
42 //////////////////////////////////////////////////////////////////////////////// 46 ////////////////////////////////////////////////////////////////////////////////
43 // BrowserWindow interface 47 // BrowserWindow interface
44 // An interface implemented by the "view" of the Browser window. 48 // An interface implemented by the "view" of the Browser window.
45 // 49 //
46 // NOTE: All getters may return NULL. 50 // NOTE: All getters may return NULL.
47 class BrowserWindow { 51 class BrowserWindow {
48 public: 52 public:
49 virtual ~BrowserWindow() {} 53 virtual ~BrowserWindow() {}
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 323
320 // Invoked when the instant's tab contents should be hidden. 324 // Invoked when the instant's tab contents should be hidden.
321 // |instant_is_active| indicates if instant is still active. 325 // |instant_is_active| indicates if instant is still active.
322 virtual void HideInstant(bool instant_is_active) = 0; 326 virtual void HideInstant(bool instant_is_active) = 0;
323 327
324 // Returns the desired bounds for instant in screen coordinates. Note that if 328 // Returns the desired bounds for instant in screen coordinates. Note that if
325 // instant isn't currently visible this returns the bounds instant would be 329 // instant isn't currently visible this returns the bounds instant would be
326 // placed at. 330 // placed at.
327 virtual gfx::Rect GetInstantBounds() = 0; 331 virtual gfx::Rect GetInstantBounds() = 0;
328 332
333 // Adjust navigation params if necessary for the type of browser window,
334 // e.g. change large panels into tabs for ChromeOS.
335 virtual void AdjustNavigateParams(browser::NavigateParams* params) = 0;
336
329 #if defined(OS_CHROMEOS) 337 #if defined(OS_CHROMEOS)
330 // Shows the keyboard overlay dialog box. 338 // Shows the keyboard overlay dialog box.
331 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) = 0; 339 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) = 0;
332 #endif 340 #endif
333 341
334 // Construct a BrowserWindow implementation for the specified |browser|. 342 // Construct a BrowserWindow implementation for the specified |browser|.
335 static BrowserWindow* CreateBrowserWindow(Browser* browser); 343 static BrowserWindow* CreateBrowserWindow(Browser* browser);
336 344
337 // Construct a FindBar implementation for the specified |browser|. 345 // Construct a FindBar implementation for the specified |browser|.
338 static FindBar* CreateFindBar(Browser* browser_window); 346 static FindBar* CreateFindBar(Browser* browser_window);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 379
372 // Returns the ToolbarView. 380 // Returns the ToolbarView.
373 virtual ToolbarView* GetToolbarView() const = 0; 381 virtual ToolbarView* GetToolbarView() const = 0;
374 #endif 382 #endif
375 383
376 protected: 384 protected:
377 virtual ~BrowserWindowTesting() {} 385 virtual ~BrowserWindowTesting() {}
378 }; 386 };
379 387
380 #endif // CHROME_BROWSER_UI_BROWSER_WINDOW_H_ 388 #endif // CHROME_BROWSER_UI_BROWSER_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698