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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 8298005: Fixes bug in instant where we would end up incorrectly using the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweak Created 9 years, 2 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/ui/panels/panel.cc ('k') | chrome/browser/ui/views/frame/browser_view.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) 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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) 305 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event)
306 OVERRIDE; 306 OVERRIDE;
307 virtual void ShowCreateWebAppShortcutsDialog(TabContentsWrapper* tab_contents) 307 virtual void ShowCreateWebAppShortcutsDialog(TabContentsWrapper* tab_contents)
308 OVERRIDE; 308 OVERRIDE;
309 virtual void ShowCreateChromeAppShortcutsDialog( 309 virtual void ShowCreateChromeAppShortcutsDialog(
310 Profile*, const Extension* app) OVERRIDE; 310 Profile*, const Extension* app) OVERRIDE;
311 virtual void Cut() OVERRIDE; 311 virtual void Cut() OVERRIDE;
312 virtual void Copy() OVERRIDE; 312 virtual void Copy() OVERRIDE;
313 virtual void Paste() OVERRIDE; 313 virtual void Paste() OVERRIDE;
314 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; 314 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE;
315 virtual void HideInstant(bool instant_is_active) OVERRIDE; 315 virtual void HideInstant() OVERRIDE;
316 virtual gfx::Rect GetInstantBounds() OVERRIDE; 316 virtual gfx::Rect GetInstantBounds() OVERRIDE;
317 virtual WindowOpenDisposition GetDispositionForPopupBounds( 317 virtual WindowOpenDisposition GetDispositionForPopupBounds(
318 const gfx::Rect& bounds) OVERRIDE; 318 const gfx::Rect& bounds) OVERRIDE;
319 virtual FindBar* CreateFindBar() OVERRIDE; 319 virtual FindBar* CreateFindBar() OVERRIDE;
320 #if defined(OS_CHROMEOS) 320 #if defined(OS_CHROMEOS)
321 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE; 321 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE;
322 #endif 322 #endif
323 virtual void ShowAvatarBubble(TabContents* tab_contents, 323 virtual void ShowAvatarBubble(TabContents* tab_contents,
324 const gfx::Rect& rect) OVERRIDE; 324 const gfx::Rect& rect) OVERRIDE;
325 325
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 base::TimeTicks last_animation_time_; 691 base::TimeTicks last_animation_time_;
692 692
693 // If this flag is set then SetFocusToLocationBar() will set focus to the 693 // If this flag is set then SetFocusToLocationBar() will set focus to the
694 // location bar even if the browser window is not active. 694 // location bar even if the browser window is not active.
695 bool force_location_bar_focus_; 695 bool force_location_bar_focus_;
696 696
697 DISALLOW_COPY_AND_ASSIGN(BrowserView); 697 DISALLOW_COPY_AND_ASSIGN(BrowserView);
698 }; 698 };
699 699
700 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 700 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698