diff options
Diffstat (limited to 'chrome/browser/views')
30 files changed, 90 insertions, 90 deletions
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc index 6c60840..4abc588 100644 --- a/chrome/browser/views/about_ipc_dialog.cc +++ b/chrome/browser/views/about_ipc_dialog.cc @@ -436,4 +436,4 @@ void AboutIPCDialog::ButtonPressed(views::BaseButton* button) { } } -#endif // IPC_MESSAGE_LOG_ENABLED
\ No newline at end of file +#endif // IPC_MESSAGE_LOG_ENABLED diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc index c62b175..2a4740f 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -36,7 +36,7 @@ class TestingPageNavigator : public PageNavigator { // Base class for event generating bookmark view tests. These test are intended // to exercise ChromeMenus, but that's easier done with BookmarkBarView rather // than ChromeMenu itself. -// +// // SetUp creates a bookmark model with the following structure. // All folders are in upper case, all URLs in lower case. // F1 @@ -939,7 +939,7 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase { ASSERT_TRUE(child_menu != NULL); ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP, NULL); - + // Delay until we send tab, otherwise the message box doesn't appear // correctly. MessageLoop::current()->PostDelayedTask(FROM_HERE, diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index c0fe27a..dc4bf29 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -233,7 +233,7 @@ void BookmarkBubbleView::Init() { cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0, GridLayout::USE_PREF, 0, 0); cs->AddPaddingColumn(1, kUnrelatedControlHorizontalSpacing); - cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0, GridLayout::USE_PREF, + cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0, GridLayout::USE_PREF, 0, 0); // Middle (input field) rows. @@ -291,7 +291,7 @@ std::wstring BookmarkBubbleView::GetTitle() { return std::wstring(); } -void BookmarkBubbleView::ButtonPressed(views::NativeButton* sender) { +void BookmarkBubbleView::ButtonPressed(views::NativeButton* sender) { if (sender == edit_button_) { UserMetrics::RecordAction(L"BookmarkBubble_Edit", profile_); ShowEditor(); @@ -299,7 +299,7 @@ void BookmarkBubbleView::ButtonPressed(views::NativeButton* sender) { DCHECK(sender == close_button_); Close(); } - // WARNING: we've most likely been deleted when CloseWindow returns. + // WARNING: we've most likely been deleted when CloseWindow returns. } void BookmarkBubbleView::LinkActivated(Link* source, int event_flags) { diff --git a/chrome/browser/views/bookmark_bubble_view.h b/chrome/browser/views/bookmark_bubble_view.h index 2f0f7c1..31c8c8c 100644 --- a/chrome/browser/views/bookmark_bubble_view.h +++ b/chrome/browser/views/bookmark_bubble_view.h @@ -101,7 +101,7 @@ class BookmarkBubbleView : public views::View, // editor (depending upon which link was clicked). virtual void LinkActivated(views::Link* source, int event_flags); - // ButtonListener method, closes the bubble or opens the edit dialog. + // ButtonListener method, closes the bubble or opens the edit dialog. virtual void ButtonPressed(views::NativeButton* sender); // ComboBox::Listener method. Changes the parent of the bookmark. diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc index 6e5bada..bbd0731 100644 --- a/chrome/browser/views/bookmark_table_view.cc +++ b/chrome/browser/views/bookmark_table_view.cc @@ -433,7 +433,7 @@ void BookmarkTableView::PaintAltText() { 1, bounds.width() - 2, bounds.height() - 2, ChromeCanvas::TEXT_ALIGN_LEFT); canvas.getTopPlatformDevice().drawToHDC(dc, bounds.x(), bounds.y(), NULL); - ReleaseDC(GetNativeControlHWND(), dc); + ReleaseDC(GetNativeControlHWND(), dc); } gfx::Rect BookmarkTableView::GetAltTextBounds() { diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 350e5f6..8b08a3f 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -207,7 +207,7 @@ DownloadItemView::DownloadItemView(DownloadItem* download, // Extract the file extension (if any). std::wstring extension = file_util::GetFileExtensionFromPath(file_name); - std::wstring rootname = + std::wstring rootname = file_util::GetFilenameWithoutExtensionFromPath(file_name); // Elide giant extensions (this shouldn't currently be hit, but might @@ -217,7 +217,7 @@ DownloadItemView::DownloadItemView(DownloadItem* download, ElideString(rootname, kFileNameMaxLength - extension.length(), &rootname); dangerous_download_label_ = new views::Label( - l10n_util::GetStringF(IDS_PROMPT_DANGEROUS_DOWNLOAD, + l10n_util::GetStringF(IDS_PROMPT_DANGEROUS_DOWNLOAD, rootname + L"." + extension)); dangerous_download_label_->SetMultiLine(true); dangerous_download_label_->SetHorizontalAlignment( @@ -456,7 +456,7 @@ void DownloadItemView::Paint(ChromeCanvas* canvas) { // Last value of x was the end of the right image, just before the button. // Note that in dangerous mode we use a label (as the text is multi-line). if (!IsDangerousMode()) { - std::wstring filename = + std::wstring filename = gfx::ElideFilename(download_->GetFileName().ToWStringHack(), font_, kTextWidth); diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 11d7571..7e01074 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -53,7 +53,7 @@ void EditKeywordController::Show() { // Window interprets an empty rectangle as needing to query the content for // the size as well as centering relative to the parent. views::Window::CreateChromeWindow(::IsWindow(parent_) ? parent_ : NULL, - gfx::Rect(), this); + gfx::Rect(), this); window()->Show(); GetDialogClientView()->UpdateDialogButtons(); title_tf_->SelectAll(); diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index 79fa9c0..1ed7916 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -120,7 +120,7 @@ class FirstRunBubbleView : public views::View, gfx::Size pref_size = label1_->GetPreferredSize(); label1_->SetMultiLine(true); label1_->SizeToFit(canvas.width() - kBubblePadding * 2); - label1_->SetBounds(kBubblePadding, kBubblePadding, + label1_->SetBounds(kBubblePadding, kBubblePadding, canvas.width() - kBubblePadding * 2, pref_size.height()); diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index 274f561..55e8d5b 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -164,7 +164,7 @@ gfx::Rect GlassBrowserFrameView::GetWindowBoundsForClientBounds( RECT rect = client_bounds.ToRECT(); AdjustWindowRectEx(&rect, frame_->window_style(), FALSE, frame_->window_ex_style()); - return gfx::Rect(rect); + return gfx::Rect(rect); } int top_height = NonClientTopBorderHeight(); @@ -296,7 +296,7 @@ void GlassBrowserFrameView::PaintOTRAvatar(ChromeCanvas* canvas) { SkBitmap otr_avatar_icon = browser_view_->GetOTRAvatarIcon(); canvas->DrawBitmapInt(otr_avatar_icon, 0, (otr_avatar_icon.height() - otr_avatar_bounds_.height()) / 2, - otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), + otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), MirroredLeftPointForRect(otr_avatar_bounds_), otr_avatar_bounds_.y(), otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), false); } diff --git a/chrome/browser/views/frame/glass_browser_frame_view.h b/chrome/browser/views/frame/glass_browser_frame_view.h index edaed89..f6e3aff 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.h +++ b/chrome/browser/views/frame/glass_browser_frame_view.h @@ -63,7 +63,7 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView { // Returns the bounds of the client area for the specified view size. gfx::Rect CalculateClientAreaBounds(int width, int height) const; - + // Starts/Stops the window throbber running. void StartThrobber(); void StopThrobber(); diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 39ba2d0..8452a37 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -167,7 +167,7 @@ class OTRActiveWindowResources : public views::WindowResources { virtual SkBitmap* GetPartBitmap(views::FramePartBitmap part) const { return standard_frame_bitmaps_[part]; } - + private: static void InitClass() { static bool initialized = false; @@ -842,7 +842,7 @@ void OpaqueBrowserFrameView::PaintOTRAvatar(ChromeCanvas* canvas) { SkBitmap otr_avatar_icon = browser_view_->GetOTRAvatarIcon(); canvas->DrawBitmapInt(otr_avatar_icon, 0, (otr_avatar_icon.height() - otr_avatar_bounds_.height()) / 2, - otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), + otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), MirroredLeftPointForRect(otr_avatar_bounds_), otr_avatar_bounds_.y(), otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), false); } diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h index f25e4f4..e21ff3d 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.h +++ b/chrome/browser/views/frame/opaque_browser_frame_view.h @@ -115,7 +115,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView, return frame_->is_active() || paint_as_active() ? current_active_resources_ : current_inactive_resources_; } - + // The layout rect of the title, if visible. gfx::Rect title_bounds_; diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index 590e8a8..72179ea 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -130,7 +130,7 @@ class HungRendererWarningView : public views::View, virtual views::View* GetExtraView(); virtual bool Accept(bool window_closing); virtual views::View* GetContentsView(); - + // views::NativeButton::Listener overrides: virtual void ButtonPressed(views::NativeButton* sender); @@ -379,7 +379,7 @@ void HungRendererWarningView::CreateKillButtonView() { kill_button_->SetListener(this); kill_button_container_ = new ButtonContainer; - + using views::GridLayout; using views::ColumnSet; diff --git a/chrome/browser/views/hwnd_html_view.h b/chrome/browser/views/hwnd_html_view.h index 67952a2..6f57ea3 100644 --- a/chrome/browser/views/hwnd_html_view.h +++ b/chrome/browser/views/hwnd_html_view.h @@ -49,7 +49,7 @@ class HWNDHtmlView : public views::HWNDView { // Our HTML rendering component. RenderViewHost* render_view_host_; - + // Whether or not the rendered content is permitted to send messages back to // the view, through |delegate_| via ProcessDOMUIMessage. bool allow_dom_ui_bindings_; diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc index e7bd61c..def2826 100644 --- a/chrome/browser/views/importer_view.cc +++ b/chrome/browser/views/importer_view.cc @@ -154,27 +154,27 @@ std::wstring ImporterView::GetItemAt(views::ComboBox* source, int index) { return importer_host_->GetSourceProfileNameAt(index); } -void ImporterView::ItemChanged(views::ComboBox* combo_box, +void ImporterView::ItemChanged(views::ComboBox* combo_box, int prev_index, int new_index) { DCHECK(combo_box); - DCHECK(checkbox_items_.size() >= - static_cast<size_t>(importer_host_->GetAvailableProfileCount())); - - if (prev_index == new_index) + DCHECK(checkbox_items_.size() >= + static_cast<size_t>(importer_host_->GetAvailableProfileCount())); + + if (prev_index == new_index) return; - + // Save the current state uint16 prev_items = GetCheckedItems(); checkbox_items_[prev_index] = prev_items; - + // Enable/Disable the checkboxes for this Item uint16 new_enabled_items = importer_host_->GetSourceProfileInfoAt( new_index).services_supported; - SetCheckedItemsState(new_enabled_items); - - // Set the checked items for this Item + SetCheckedItemsState(new_enabled_items); + + // Set the checked items for this Item uint16 new_items = checkbox_items_[new_index]; - SetCheckedItems(new_items); + SetCheckedItems(new_items); } void ImporterView::ImportCanceled() { @@ -204,7 +204,7 @@ uint16 ImporterView::GetCheckedItems() { if (search_engines_checkbox_->IsEnabled() && search_engines_checkbox_->IsSelected()) items |= SEARCH_ENGINES; - return items; + return items; } void ImporterView::SetCheckedItemsState(uint16 items) { @@ -242,7 +242,7 @@ void ImporterView::SetCheckedItems(uint16 items) { history_checkbox_->SetIsSelected(false); } } - + if (favorites_checkbox_->IsEnabled()) { if (items & FAVORITES) { favorites_checkbox_->SetIsSelected(true); @@ -250,7 +250,7 @@ void ImporterView::SetCheckedItems(uint16 items) { favorites_checkbox_->SetIsSelected(false); } } - + if (passwords_checkbox_->IsEnabled()) { if (items & PASSWORDS) { passwords_checkbox_->SetIsSelected(true); @@ -258,7 +258,7 @@ void ImporterView::SetCheckedItems(uint16 items) { passwords_checkbox_->SetIsSelected(false); } } - + if (search_engines_checkbox_->IsEnabled()) { if (items & SEARCH_ENGINES) { search_engines_checkbox_->SetIsSelected(true); diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h index fa97e99..4f6efec 100644 --- a/chrome/browser/views/importer_view.h +++ b/chrome/browser/views/importer_view.h @@ -48,8 +48,8 @@ class ImporterView : public views::View, virtual std::wstring GetItemAt(views::ComboBox* source, int index); // Overridden from ChromeViews::ComboBox::Listener - virtual void ItemChanged(views::ComboBox* combo_box, - int prev_index, + virtual void ItemChanged(views::ComboBox* combo_box, + int prev_index, int new_index); // Overridden from ImportObserver: @@ -65,10 +65,10 @@ class ImporterView : public views::View, // Create a bitmap from the checkboxes of the view. uint16 GetCheckedItems(); - + // Enables/Disables all the checked items for the given state void SetCheckedItemsState(uint16 items); - + // Sets all checked items in the given state void SetCheckedItems(uint16 items); @@ -82,7 +82,7 @@ class ImporterView : public views::View, scoped_refptr<ImporterHost> importer_host_; - // Stores the state of the checked items associated with the position of the + // Stores the state of the checked items associated with the position of the // selected item in the combo-box. std::vector<uint16> checkbox_items_; diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc index b87819a..82c8047 100644 --- a/chrome/browser/views/importing_progress_view.cc +++ b/chrome/browser/views/importing_progress_view.cc @@ -307,7 +307,7 @@ void StartImportingWithUI(HWND parent_window, // still need it to exist. No user interaction will be required. if (!coordinator->is_headless()) window->Show(); - + coordinator->StartImportSettings(source_profile, items, new ProfileWriter(target_profile), first_run); diff --git a/chrome/browser/views/infobars/infobar_container.h b/chrome/browser/views/infobars/infobar_container.h index 181d95e..dba3149 100644 --- a/chrome/browser/views/infobars/infobar_container.h +++ b/chrome/browser/views/infobars/infobar_container.h @@ -40,7 +40,7 @@ class InfoBarContainer : public views::View, virtual void ViewHierarchyChanged(bool is_add, views::View* parent, views::View* child); - + private: // Overridden from NotificationObserver: virtual void Observe(NotificationType type, diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index aa60a6b..da3af20 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -214,7 +214,7 @@ void InfoBar::DestroyFocusTracker(bool restore_focus) { focus_tracker_->FocusLastFocusedExternalView(); focus_tracker_->SetFocusManager(NULL); focus_tracker_.reset(NULL); - } + } } void InfoBar::DeleteSelf() { diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h index 56f140b..15885ce 100644 --- a/chrome/browser/views/infobars/infobars.h +++ b/chrome/browser/views/infobars/infobars.h @@ -45,7 +45,7 @@ class InfoBar : public views::View, // Starts animating the InfoBar closed. It will not be closed until the // animation has completed, when |Close| will be called. void AnimateClose(); - + // Closes the InfoBar immediately and removes it from its container. Notifies // the delegate that it has closed. The InfoBar is deleted after this function // is called. diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index c1442f0..f103e0a 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -437,18 +437,18 @@ gfx::Size KeywordEditorView::GetPreferredSize() { bool KeywordEditorView::CanResize() const { return true; } - + std::wstring KeywordEditorView::GetWindowTitle() const { return l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_WINDOW_TITLE); -} +} int KeywordEditorView::GetDialogButtons() const { return DIALOGBUTTON_CANCEL; } - + bool KeywordEditorView::Accept() { open_window = NULL; - return true; + return true; } bool KeywordEditorView::Cancel() { diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h index 4323454..e6b1764 100644 --- a/chrome/browser/views/location_bar_view.h +++ b/chrome/browser/views/location_bar_view.h @@ -205,7 +205,7 @@ class LocationBarView : public LocationBar, // The minimum size is just big enough to show the tab. virtual gfx::Size GetMinimumSize(); virtual void Layout(); - + void set_profile(Profile* profile) { profile_ = profile; } private: diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index e4380a1f5..594e5e2 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -302,7 +302,7 @@ void CookiesTableView::RemoveSelectedCookies() { // Select the next row after the last row deleted (unless removing last row). DCHECK(RowCount() > 0 && last_selected_view_row != -1); - Select(view_to_model(std::min(RowCount() - 1, + Select(view_to_model(std::min(RowCount() - 1, last_selected_view_row - remove_count + 1))); } diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index be7e81f..f0ac54c 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -464,7 +464,7 @@ LanguagesPageView::LanguagesPageView(Profile* profile) starting_ui_language_index_(-1) { accept_languages_.Init(prefs::kAcceptLanguages, profile->GetPrefs(), NULL); - enable_spellcheck_.Init(prefs::kEnableSpellCheck, + enable_spellcheck_.Init(prefs::kEnableSpellCheck, profile->GetPrefs(), NULL); } @@ -607,7 +607,7 @@ void LanguagesPageView::InitControlLayout() { dictionary_language_label_ = new views::Label( l10n_util::GetString(IDS_OPTIONS_CHROME_DICTIONARY_LANGUAGE)); dictionary_language_label_->SetHorizontalAlignment( - views::Label::ALIGN_LEFT); + views::Label::ALIGN_LEFT); enable_spellchecking_checkbox_ = new views::CheckBox( l10n_util::GetString(IDS_OPTIONS_ENABLE_SPELLCHECK)); enable_spellchecking_checkbox_->SetListener(this); diff --git a/chrome/browser/views/options/languages_page_view.h b/chrome/browser/views/options/languages_page_view.h index d22a945..e79a4ab 100644 --- a/chrome/browser/views/options/languages_page_view.h +++ b/chrome/browser/views/options/languages_page_view.h @@ -93,10 +93,10 @@ class LanguagesPageView : public OptionsPageView, // The contents of the "dictionary language" combobox. scoped_ptr<LanguageComboboxModel> dictionary_language_model_; StringPrefMember dictionary_language_; - + // SpellChecker enable pref. BooleanPrefMember enable_spellcheck_; - + // This is assigned the new index of spellcheck language if the language // is changed. Otherwise, it remains -1, and pref members are not updated. int spellcheck_language_index_selected_; diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index 418d31e..510784f 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -565,7 +565,7 @@ void PageInfoWindow::Init(Profile* profile, views::Window::CreateChromeWindow(parent, gfx::Rect(), this); // TODO(beng): (Cleanup) - cert viewer button should use GetExtraView. - + if (cert_id_) { scoped_refptr<net::X509Certificate> cert; CertStore::GetSharedInstance()->RetrieveCert(cert_id_, &cert); @@ -663,13 +663,13 @@ void PageInfoWindow::ShowCertDialog(int cert_id) { if (!cert.get()) { // The certificate was not found. Could be that the renderer crashed before // we displayed the page info. - return; - } + return; + } - CRYPTUI_VIEWCERTIFICATE_STRUCT view_info = { 0 }; - view_info.dwSize = sizeof(view_info); - // We set our parent to the tab window. This makes the cert dialog created - // in CryptUIDlgViewCertificate modal to the browser. + CRYPTUI_VIEWCERTIFICATE_STRUCT view_info = { 0 }; + view_info.dwSize = sizeof(view_info); + // We set our parent to the tab window. This makes the cert dialog created + // in CryptUIDlgViewCertificate modal to the browser. view_info.hwndParent = window()->owning_window(); view_info.dwFlags = CRYPTUI_DISABLE_EDITPROPERTIES | CRYPTUI_DISABLE_ADDTOSTORE; diff --git a/chrome/browser/views/password_manager_view.h b/chrome/browser/views/password_manager_view.h index a43b9f3..a5e5950 100644 --- a/chrome/browser/views/password_manager_view.h +++ b/chrome/browser/views/password_manager_view.h @@ -57,7 +57,7 @@ class PasswordManagerTableModel : public views::TableModel, : display_url(url), form(password_form) { } - // Contains the URL that is displayed along with the + // Contains the URL that is displayed along with the gfx::SortedDisplayURL display_url; // The underlying PasswordForm. We own this. diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index ed50ca7..a883ad5 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -375,13 +375,13 @@ bool SelectFileDialogImpl::RunSelectFolderDialog(const std::wstring& title, browse_info.lpszTitle = title.c_str(); browse_info.pszDisplayName = dir_buffer; browse_info.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS; - + if (path->length()) { // Highlight the current value. browse_info.lParam = (LPARAM)path->c_str(); browse_info.lpfn = &BrowseCallbackProc; } - + LPITEMIDLIST list = SHBrowseForFolder(&browse_info); DisableOwner(owner); if (list) { diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc index a136046..76a6574b 100644 --- a/chrome/browser/views/tabs/tab_dragging_test.cc +++ b/chrome/browser/views/tabs/tab_dragging_test.cc @@ -50,7 +50,7 @@ TEST_F(TabDraggingTest, Tab1Tab2) { ASSERT_TRUE(browser->AppendTab(tab2_url)); scoped_ptr<TabProxy> tab2(browser->GetTab(1)); ASSERT_TRUE(tab2.get()); - + // Add Tab_3. GURL tab3_url("about:plugins"); ASSERT_TRUE(browser->AppendTab(tab3_url)); @@ -100,8 +100,8 @@ TEST_F(TabDraggingTest, Tab1Tab2) { // | Tab_1 | Tab_2 | Tab_3 | // ---- ---- ---- ---- ---- ---- ---- ---- ---- // x---- ----> - // ____________ - // / X \ + // ____________ + // / X \ // | Tab_1 | // ---- ---- ---- @@ -130,7 +130,7 @@ TEST_F(TabDraggingTest, Tab1Tab2) { EXPECT_EQ(tab2_url.spec(), tab1_new_url.spec()); } -// Drag Tab_1 into the position of Tab_3. +// Drag Tab_1 into the position of Tab_3. TEST_F(TabDraggingTest, Tab1Tab3) { scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); @@ -153,7 +153,7 @@ TEST_F(TabDraggingTest, Tab1Tab3) { ASSERT_TRUE(browser->AppendTab(tab2_url)); scoped_ptr<TabProxy> tab2(browser->GetTab(1)); ASSERT_TRUE(tab2.get()); - + // Add Tab_3. GURL tab3_url("about:plugins"); ASSERT_TRUE(browser->AppendTab(tab3_url)); @@ -203,13 +203,13 @@ TEST_F(TabDraggingTest, Tab1Tab3) { // | Tab_1 | Tab_2 | Tab_3 | // ---- ---- ---- ---- ---- ---- ---- ---- ---- // x---- ---- ---- ---- ---- ----> - // ____________ - // / X \ + // ____________ + // / X \ // | Tab_1 | // ---- ---- ---- POINT start; - POINT end; + POINT end; start.x = bounds1.x() + bounds1.width()/2; start.y = bounds1.y() + bounds1.height()/2; end.x = start.x + bounds1.width()/2 + bounds2.width() + bounds3.width()/2; @@ -263,7 +263,7 @@ TEST_F(TabDraggingTest, Tab1Tab3Escape) { ASSERT_TRUE(browser->AppendTab(tab2_url)); scoped_ptr<TabProxy> tab2(browser->GetTab(1)); ASSERT_TRUE(tab2.get()); - + // Add Tab_3. GURL tab3_url("about:plugins"); ASSERT_TRUE(browser->AppendTab(tab3_url)); @@ -313,19 +313,19 @@ TEST_F(TabDraggingTest, Tab1Tab3Escape) { // | Tab_1 | Tab_2 | Tab_3 | // ---- ---- ---- ---- ---- ---- ---- ---- ---- // x---- ---- ---- ---- ---- ----> + ESCAPE - // ____________ - // / X \ + // ____________ + // / X \ // | Tab_1 | // ---- ---- ---- POINT start; - POINT end; + POINT end; start.x = bounds1.x() + bounds1.width()/2; start.y = bounds1.y() + bounds1.height()/2; end.x = start.x + bounds1.width()/2 + bounds2.width() + bounds3.width()/2; end.y = start.y; - // Simulate drag with 'true' as the last parameter. This will interrupt + // Simulate drag with 'true' as the last parameter. This will interrupt // in-flight with Escape. ASSERT_TRUE(browser->SimulateDrag(start, end, views::Event::EF_LEFT_BUTTON_DOWN, @@ -346,7 +346,7 @@ TEST_F(TabDraggingTest, Tab1Tab3Escape) { ASSERT_TRUE(tab3.get()); GURL tab3_new_url; ASSERT_TRUE(tab3->GetCurrentURL(&tab3_new_url)); - + // The tabs should be in their original positions. EXPECT_EQ(tab1_new_url.spec(), tab1_url.spec()); EXPECT_EQ(tab2_new_url.spec(), tab2_url.spec()); @@ -376,7 +376,7 @@ TEST_F(TabDraggingTest, Tab2OutOfTabStrip) { ASSERT_TRUE(browser->AppendTab(tab2_url)); scoped_ptr<TabProxy> tab2(browser->GetTab(1)); ASSERT_TRUE(tab2.get()); - + // Add Tab_3. GURL tab3_url("about:plugins"); ASSERT_TRUE(browser->AppendTab(tab3_url)); @@ -435,17 +435,17 @@ TEST_F(TabDraggingTest, Tab2OutOfTabStrip) { // / \ / \ / \ // | Tab_1 | Tab_2 | Tab_3 | // ---- ---- ---- ---- ---- ---- ---- ---- ---- - // x - // | + // x + // | // | (Drag this below, out of tab strip) - // V - // ____________ - // / X \ + // V + // ____________ + // / X \ // | Tab_2 | (New Window) // ---- ---- ---- ---- ---- ---- ---- POINT start; - POINT end; + POINT end; start.x = bounds2.x() + bounds2.width()/2; start.y = bounds2.y() + bounds2.height()/2; end.x = start.x; @@ -471,8 +471,8 @@ TEST_F(TabDraggingTest, Tab2OutOfTabStrip) { ASSERT_TRUE(tab2.get()); GURL tab2_new_url; ASSERT_TRUE(tab2->GetCurrentURL(&tab2_new_url)); - - // Now check for proper shifting of tabs; i.e., Tab_3 in window 1 should + + // Now check for proper shifting of tabs; i.e., Tab_3 in window 1 should // shift left to the position of Tab_2; Tab_1 should stay where it was. EXPECT_EQ(tab1_new_url.spec(), tab1_url.spec()); EXPECT_EQ(tab2_new_url.spec(), tab3_url.spec()); diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index f060135..c5e16b4 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -808,7 +808,7 @@ void BrowserToolbarView::ButtonPressed(views::BaseButton* sender) { // static int BrowserToolbarView::PopupTopSpacing() { - return GetWidget()->AsWindow()->UseNativeFrame() ? 0 + return GetWidget()->AsWindow()->UseNativeFrame() ? 0 : kPopupTopSpacingNonGlass; } |